diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-02-13 21:25:43 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-02-13 21:25:43 +0000 |
| commit | 94db2d9ffae095a9d1c759fb76dc3e6e85e03644 (patch) | |
| tree | ab4b54817bd926f8933500c990b58016f0165c20 /Makefile.nmake | |
| parent | 5c9d15eeca42ba9af11996a7aae592a90733c06e (diff) | |
Copy over the file open/save code from the Win32 native branch.
The Windows-native routines were integrated by inserting
#if GTK_MAJOR_VERSION >= 2 && _WIN32
win32_native_routine(GDK_WINDOW_HWND(top_level->window));
return;
#endif
at the beginning of each GTK+ file routine. There's probably a prettier
way to do this.
Some of the sizes need to be tweaked in win32-file-dlg.rc, but everything
seems to work.
Fix up whitespace.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17285 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 24507787ee..1268f2b1dd 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -46,7 +46,7 @@ EXTRA_OBJECTS = \ strptime.obj ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ - wsock32.lib user32.lib shell32.lib \ + wsock32.lib user32.lib shell32.lib comctl32.lib \ $(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \ !IFDEF ENABLE_LIBETHEREAL epan\libethereal.lib \ |