From 91bd95beb777ce52af32f2c7905e7a907b8b5133 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 10 Jan 2014 14:18:54 +0000
Subject: [PATCH] Allow building wxGTK using GTK+3 under Windows too.

No real changes, just use the right libraries for GTK+3 port.

Closes #15871.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/common.bkl | 1 +
 docs/changes.txt           | 4 ++++
 include/msvc/wx/setup.h    | 9 +++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 78915bc7a4..2099b49647 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -608,6 +608,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
 
     <set var="LIB_GTK">
         <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1' and TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib glib-2.0.lib</if>
+        <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1' and TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">libgtk-3.dll.a libgdk-3.dll.a pangocairo-1.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib glib-2.0.lib</if>
     </set>
 
     <!-- for GUI libs/samples: -->
diff --git a/docs/changes.txt b/docs/changes.txt
index 2a3f80a0d7..64aa82efd5 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -19,6 +19,10 @@ All (GUI):
 - Add wxHtmlWindow::SetDefaultHTMLCursor() (Jeff A. Marr).
 - Add default ctor and Create() to wxContextHelpButton (Hanmac).
 
+wxGTK:
+
+- Support building wxGTK3 under Windows (Kolya Kosenko).
+
 wxMSW:
 
 - Make wxFILTER_INCLUDE_LIST in wxTextValidator actually usable.
diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 7a8d472c78..ad0696e245 100644
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -243,8 +243,13 @@
     #endif
 
     #ifdef __WXGTK__
-        #pragma comment(lib, "gtk-win32-2.0.lib")
-        #pragma comment(lib, "gdk-win32-2.0.lib")
+        #ifdef __WXGTK3__
+            #pragma comment(lib, "libgtk-3.dll.a")
+            #pragma comment(lib, "libgdk-3.dll.a")
+        #else
+            #pragma comment(lib, "gtk-win32-2.0.lib")
+            #pragma comment(lib, "gdk-win32-2.0.lib")
+        #endif
         #pragma comment(lib, "pangocairo-1.0.lib")
         #pragma comment(lib, "gdk_pixbuf-2.0.lib")
         #pragma comment(lib, "cairo.lib")