diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-11-03 16:03:08 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2016-11-03 16:55:35 +0800 |
| commit | abef8d4860a057b0f98840d48afdb65997e10acc (patch) | |
| tree | fd4496fbb818928d687ecc8faffa1e1eac338fc0 /gtk/gtk-win32.rc.body.in | |
| parent | 2324b96a325532ba05d5eeb388e9d8f4aeef2a7f (diff) | |
| download | gtk+-abef8d4860a057b0f98840d48afdb65997e10acc.tar.gz | |
Windows: Update code for monolithic GTK DLL
Now that the autotools build folded the GDK/GSK bits into the main GTK+
DLL, there are some updates that need to be done for this. We need to:
-Fold the DllMain() of GDK-Win32 into the main GTK+ DllMain(), as we need
the HINSTANCE to register the window. We can't have two DllMain()'s in a
single DLL.
-Remove the GDK rc(.in) files, as that is not used anymore. Make the GTK+
.rc(.in) file load the gtk.ico GTK+ logo file instead so that we still
get the GTK+ logo for the application icon by default. Update the
autotools build files as well.
-Revert commit b9f9980 as LRN pointed out in comment 25 in bug 773299, as
GTK+ is now a monolithic DLL, and we ought not to export this private
function.
https://bugzilla.gnome.org/show_bug.cgi?id=773299
Diffstat (limited to 'gtk/gtk-win32.rc.body.in')
| -rw-r--r-- | gtk/gtk-win32.rc.body.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in index 4a42d5a666..251128fe48 100644 --- a/gtk/gtk-win32.rc.body.in +++ b/gtk/gtk-win32.rc.body.in @@ -1,5 +1,7 @@ #include <winver.h> +GTK_ICON ICON "gtk.ico" + VS_VERSION_INFO VERSIONINFO FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0 PRODUCTVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0 |