From 8de6fc7792015ae185ac4d1d5388ad1717e95867 Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Sun, 13 Apr 2008 13:45:50 +0000 Subject: [PATCH] fixes related to file_dlg_win32.rc svn path=/trunk/; revision=24976 --- image/Makefile.nmake | 2 +- image/{win32-file-dlg.rc => file_dlg_win32.rc} | 2 +- image/wireshark.rc.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename image/{win32-file-dlg.rc => file_dlg_win32.rc} (99%) diff --git a/image/Makefile.nmake b/image/Makefile.nmake index c248b50129..0200094ac1 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -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 > $@ diff --git a/image/win32-file-dlg.rc b/image/file_dlg_win32.rc similarity index 99% rename from image/win32-file-dlg.rc rename to image/file_dlg_win32.rc index 34d17e12f0..433c700b3e 100644 --- a/image/win32-file-dlg.rc +++ b/image/file_dlg_win32.rc @@ -1,6 +1,6 @@ #include #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 diff --git a/image/wireshark.rc.in b/image/wireshark.rc.in index 8d6b3392f2..fbb97e44cd 100644 --- a/image/wireshark.rc.in +++ b/image/wireshark.rc.in @@ -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"