diff options
author | Vincent Sanders <vince@kyllikki.org> | 2015-03-13 14:55:15 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2015-03-13 14:55:15 +0000 |
commit | 52b50db3a6f1d52b3c9e18b36121f487c09de906 (patch) | |
tree | e5a8d701af888f7e021ee076d6dfe612a5b777d8 | |
parent | 8525c857da966580c57aa595ec44ba1c4fc2326a (diff) | |
download | netsurf-52b50db3a6f1d52b3c9e18b36121f487c09de906.tar.gz netsurf-52b50db3a6f1d52b3c9e18b36121f487c09de906.tar.bz2 |
Cleanup windows download window header
-rw-r--r-- | windows/download.c | 20 | ||||
-rw-r--r-- | windows/download.h | 33 |
2 files changed, 23 insertions, 30 deletions
diff --git a/windows/download.c b/windows/download.c index ed7b10832..995ca1386 100644 --- a/windows/download.c +++ b/windows/download.c @@ -39,6 +39,26 @@ #include "windows/resourceid.h" #include "windows/schedule.h" +struct gui_download_window { + HWND hwnd; + char *title; + char *filename; + char *domain; + char *time_left; + char *total_size; + char *original_total_size; + int size; + int downloaded; + unsigned int progress; + int time_remaining; + struct timeval start_time; + int speed; + int error; + struct gui_window *window; + FILE *file; + download_status status; +}; + static bool downloading = false; static struct gui_download_window *download1; diff --git a/windows/download.h b/windows/download.h index 72485625c..2fe3b54c9 100644 --- a/windows/download.h +++ b/windows/download.h @@ -19,9 +19,6 @@ #ifndef _NETSURF_WINDOWS_DOWNLOAD_H_ #define _NETSURF_WINDOWS_DOWNLOAD_H_ -#include <time.h> -#include <windows.h> - extern struct gui_download_table *win32_download_table; typedef enum { @@ -32,33 +29,9 @@ typedef enum { DOWNLOAD_CANCELED } download_status; -typedef enum { - DOWNLOAD_PAUSE = 1 << 0, - DOWNLOAD_RESUME = 1 << 1, - DOWNLOAD_CANCEL = 1 << 2, - DOWNLOAD_CLEAR = 1 << 3 -} download_actions; - -struct gui_download_window { - HWND hwnd; - char *title; - char *filename; - char *domain; - char *time_left; - char *total_size; - char *original_total_size; - int size; - int downloaded; - unsigned int progress; - int time_remaining; - struct timeval start_time; - int speed; - int error; - struct gui_window *window; - FILE *file; - download_status status; -}; - +/** + * Initialise the win32 window class for the download window + */ void nsws_download_window_init(struct gui_window *); #endif |