fixes related to file_dlg_win32.rc
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 13 Apr 2008 13:45:50 +0000 (13:45 +0000)
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 13 Apr 2008 13:45:50 +0000 (13:45 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24976 f5534014-38df-0310-8fa8-9805f1628bb7

image/Makefile.nmake
image/file_dlg_win32.rc [moved from image/win32-file-dlg.rc with 99% similarity]
image/wireshark.rc.in

index c248b5012987ce4999cda1353a8033defca1a193..0200094ac1ea924d0704dcce42d716f25cce3280 100644 (file)
@@ -15,7 +15,7 @@ wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake
                -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \
                < wireshark.exe.manifest.in > $@
 
-wireshark.rc   : win32-file-dlg.rc wireshark.rc.in wireshark.exe.manifest ..\config.nmake
+wireshark.rc   : file_dlg_win32.rc wireshark.rc.in wireshark.exe.manifest ..\config.nmake
        sed -e s/@VERSION@/$(VERSION)/ \
                -e s/@RC_VERSION@/$(RC_VERSION)/ \
                < wireshark.rc.in > $@
similarity index 99%
rename from image/win32-file-dlg.rc
rename to image/file_dlg_win32.rc
index 34d17e12f0c7bf7afe8af5cf41054c2ab52ccbb4..433c700b3efcb6d2d1c50ce56997566119388641 100644 (file)
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include "richedit.h"
-#include "../gtk/win32-file-dlg.h"
+#include "../gtk/file_dlg_win32.h"
 
 WIRESHARK_OPENFILENAME_TEMPLATE DIALOG 0, 0, 368, 94
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
index 8d6b3392f26342f10c17c3ad67a79734f31a2c2c..fbb97e44cd982f37da4d3507d86a52b282846194 100644 (file)
@@ -1,6 +1,6 @@
 #include "winver.h"
 
-#include "win32-file-dlg.rc"
+#include "file_dlg_win32.rc"
 
 WIRESHARK_ICON1                ICON                    "wireshark.ico"
 WIRESHARK_ICON2        ICON                    "wiresharkdoc.ico"