diff options
-rw-r--r-- | ui/file_dialog.h | 15 | ||||
-rw-r--r-- | ui/win32/file_dlg_win32.c | 23 | ||||
-rw-r--r-- | ui/win32/file_dlg_win32.h | 9 |
3 files changed, 23 insertions, 24 deletions
diff --git a/ui/file_dialog.h b/ui/file_dialog.h index 1858f43ccc..73c3f02cfc 100644 --- a/ui/file_dialog.h +++ b/ui/file_dialog.h @@ -36,6 +36,21 @@ typedef enum { CANCELLED } check_savability_t; +typedef enum { + merge_append, + merge_chrono, + merge_prepend +} merge_action_e; + +typedef enum { + export_type_text = 1, + export_type_ps, + export_type_csv, + export_type_psml, + export_type_pdml, + export_type_carrays +} export_type_e; + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 7b6720b640..2761bedc4f 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -48,15 +48,16 @@ #include "wsutil/file_util.h" #include "wsutil/unicode-utils.h" -#include "../alert_box.h" -#include "../color.h" -#include "../print.h" -#include "../simple_dialog.h" -#include "../util.h" -#include "../color_filters.h" -#include "../merge.h" +#include "color.h" +#include "print.h" +#include "color_filters.h" +#include "merge.h" +#include "ui/alert_box.h" +#include "ui/file_dialog.h" #include "ui/last_open_dir.h" +#include "ui/simple_dialog.h" +#include "ui/util.h" #include "ui/gtk/main.h" #include "ui/gtk/file_dlg.h" @@ -68,18 +69,10 @@ #include "ui/gtk/help_dlg.h" #include "ui/gtk/export_sslkeys.h" -typedef enum { - merge_append, - merge_chrono, - merge_prepend -} merge_action_e; - #define FILE_OPEN_DEFAULT 1 /* All Files */ #define FILE_MERGE_DEFAULT FILE_OPEN_DEFAULT -#define FILE_SAVE_DEFAULT 1 /* Wireshark/tcpdump */ - #define FILE_TYPES_EXPORT \ _T("Plain text (*.txt)\0") _T("*.txt\0") \ _T("PostScript (*.ps)\0") _T("*.ps\0") \ diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h index 1b7345a5f4..d4a49d1921 100644 --- a/ui/win32/file_dlg_win32.h +++ b/ui/win32/file_dlg_win32.h @@ -31,15 +31,6 @@ extern "C" { #endif /* __cplusplus */ -typedef enum { - export_type_text = 1, - export_type_ps, - export_type_csv, - export_type_psml, - export_type_pdml, - export_type_carrays -} export_type_e; - /** Open the "Open" dialog box. * * @param h_wnd HWND of the parent window. |