forked from osmocom/wireshark
fixes related to file_dlg_win32.rc
svn path=/trunk/; revision=24976
This commit is contained in:
parent
6fd6381ab3
commit
8de6fc7792
|
@ -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 > $@
|
||||
|
|
|
@ -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
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue