use the ending "_win32" for every windows specific file

svn path=/trunk/; revision=24972

14 files changed, 19 insertions, 21 deletions

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index ca5147f72e..0f4aa6b280 100644
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -40,7 +40,6 @@ WIRESHARK_GTK_SRC = \
 	airpcap_gui_utils.c \
 	capture_dlg.c	\
 	capture_file_dlg.c	\
-	capture_if_details_dlg.c	\
 	capture_if_dlg.c	\
 	capture_info_dlg.c	\
 	capture_prefs.c	\
@@ -206,7 +205,6 @@ noinst_HEADERS = \
 	airpcap_gui_utils.h \
 	capture_dlg.h	\
 	capture_file_dlg.h	\
-	capture_if_details_dlg.h	\
 	capture_prefs.h	\
 	cfilter_combo_utils.h \
 	color_dlg.h	\
@@ -295,13 +293,14 @@ noinst_HEADERS = \
 EXTRA_DIST = \
 	airpcap_dlg.c \
 	airpcap_gui_utils.c \
-	capture_if_details_dlg.c	\
+	capture_if_details_dlg_win32.c	\
+	capture_if_details_dlg_win32.h	\
 	doxygen.cfg.in \
+	file_dlg_win32.c \
+	file_dlg_win32.h \
 	main_airpcap_toolbar.c \
 	Makefile.common \
 	Makefile.nmake \
-	print_mswin.c  \
-	print_mswin.h  \
-	win32-file-dlg.c \
-	win32-file-dlg.h
+	print_win32.c  \
+	print_win32.h
 
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 0212d53e14..21ec278295 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -26,8 +26,9 @@ include Makefile.common
 # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST
 WIRESHARK_WIN32_GTK_SRC = \
 	$(WIRESHARK_GTK_SRC) \
-	print_mswin.c \
-	win32-file-dlg.c \
+	capture_if_details_dlg_win32.c	\
+	print_win32.c \
+	file_dlg_win32.c \
 !IFDEF PORTAUDIO_DIR
 !IF "$(PORTAUDIO_VERSION)" == "18"
 	pa_lib.c \
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index 066485a412..315ca1ced3 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.c
@@ -70,7 +70,7 @@
 #if _WIN32
 #include <gdk/gdkwin32.h>
 #include <windows.h>
-#include "gtk/win32-file-dlg.h"
+#include "gtk/file_dlg_win32.h"
 #endif
 
 
diff --git a/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg_win32.c
index fade0494f6..a26cb10705 100644
--- a/gtk/capture_if_details_dlg.c
+++ b/gtk/capture_if_details_dlg_win32.c
@@ -49,7 +49,7 @@
 #include "gtk/gui_utils.h"
 #include "gtk/help_dlg.h"
 #include "gtk/gtkvumeter.h"
-#include "gtk/capture_if_details_dlg.h"
+#include "gtk/capture_if_details_dlg_win32.h"
 
 
 
diff --git a/gtk/capture_if_details_dlg.h b/gtk/capture_if_details_dlg_win32.h
index 8017aebc04..8017aebc04 100644
--- a/gtk/capture_if_details_dlg.h
+++ b/gtk/capture_if_details_dlg_win32.h
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index dc546e2550..6666094d4f 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -47,11 +47,11 @@
 
 #ifdef _WIN32
 #include "../capture-wpcap.h"
+#include "gtk/capture_if_details_dlg_win32.h"
 #endif
 
 #include "gtk/stock_icons.h"
 #include "gtk/capture_dlg.h"
-#include "gtk/capture_if_details_dlg.h"
 #include "gtk/recent.h"
 #include "gtk/gui_utils.h"
 #include "gtk/dlg_utils.h"
diff --git a/gtk/win32-file-dlg.c b/gtk/file_dlg_win32.c
index ba48afdb2d..159cb96013 100644
--- a/gtk/win32-file-dlg.c
+++ b/gtk/file_dlg_win32.c
@@ -56,7 +56,7 @@
 #include "gtk/main_menu.h"
 #include "gtk/drag_and_drop.h"
 #include "gtk/capture_dlg.h"
-#include "gtk/win32-file-dlg.h"
+#include "gtk/file_dlg_win32.h"
 #include "gtk/help_dlg.h"
 
 #include <windows.h>
diff --git a/gtk/win32-file-dlg.h b/gtk/file_dlg_win32.h
index 3677a71b36..3677a71b36 100644
--- a/gtk/win32-file-dlg.h
+++ b/gtk/file_dlg_win32.h
diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c
index 074ea8c5e6..2e47682620 100644
--- a/gtk/follow_stream.c
+++ b/gtk/follow_stream.c
@@ -56,7 +56,7 @@
 #include <gtk/gui_utils.h>
 #include <gtk/help_dlg.h>
 #include "gtk/main.h"
-#include "gtk/print_mswin.h"
+#include "gtk/print_win32.h"
 
 
 /* This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
diff --git a/gtk/follow_tcp.c b/gtk/follow_tcp.c
index c75b5e08e6..89fab0fc91 100644
--- a/gtk/follow_tcp.c
+++ b/gtk/follow_tcp.c
@@ -64,7 +64,7 @@
 #include "gtk/keys.h"
 #include "gtk/main.h"
 #include "gtk/gui_utils.h"
-#include "gtk/print_mswin.h"
+#include "gtk/print_win32.h"
 #include "gtk/font_utils.h"
 #include "gtk/help_dlg.h"
 #include "gtk/follow_stream.h"
diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c
index 538dd23de0..44088a746c 100644
--- a/gtk/main_proto_draw.c
+++ b/gtk/main_proto_draw.c
@@ -73,7 +73,7 @@
 #if _WIN32
 #include <gdk/gdkwin32.h>
 #include <windows.h>
-#include "win32-file-dlg.h"
+#include "file_dlg_win32.h"
 #endif
 
 #define BYTE_VIEW_WIDTH    16
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index aa800df921..8f2ebd0307 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -56,8 +56,8 @@
 #if _WIN32
 #include <gdk/gdkwin32.h>
 #include <windows.h>
-#include "gtk/win32-file-dlg.h"
-#include "gtk/print_mswin.h"
+#include "gtk/file_dlg_win32.h"
+#include "gtk/print_win32.h"
 #endif
 
 /* dialog output action */
diff --git a/gtk/print_mswin.c b/gtk/print_win32.c
index 0c196e57d4..08bbec3aa0 100644
--- a/gtk/print_mswin.c
+++ b/gtk/print_win32.c
@@ -33,11 +33,9 @@
 #include <windows.h>
 #include <commdlg.h>
 
-#ifdef __WIN32__
 #include <winspool.h>
-#endif
 
-#include "gtk/print_mswin.h"
+#include "gtk/print_win32.h"
 #include "wiretap/file_util.h"
 
 /*
diff --git a/gtk/print_mswin.h b/gtk/print_win32.h
index 21a5bce9aa..21a5bce9aa 100644
--- a/gtk/print_mswin.h
+++ b/gtk/print_win32.h