[gtkmm/gtkmm-2-22] Fix using stock items with MSVC



commit 40484f50033c27ff20457407107bab7785f72158
Author: Armin Burgmeier <armin arbur net>
Date:   Wed Aug 4 19:12:12 2010 +0200

    Fix using stock items with MSVC
    
    2010-08-04  Armin Burgmeier  <armin arbur net>
    
    	Fixed using stock items with MSVC. Bug #625489.
    
    	* gtk/gtkmmconfig.h.in: Make sure we define GTKMM_API to
    	__declspec(dllimport) also with MSVC when building gtkmm.

 ChangeLog            |    9 ++++++++-
 gtk/gtkmmconfig.h.in |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cdcd260..72e888b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-04  Armin Burgmeier  <armin arbur net>
+
+	Fixed using stock items with MSVC. Bug #625489.
+
+	* gtk/gtkmmconfig.h.in: Make sure we define GTKMM_API to
+	__declspec(dllimport) also with MSVC when building gtkmm.
+
+
 2010-07-16  Murray Cumming  <murrayc murrayc com>
 
 	Fix build errors when deprecated API is disabled.
@@ -132,7 +140,6 @@ Do not include gtk+.h. Add prototype declarations instead, as elsewhere.
     Rearrange includes to allow our undefs to work.
 
 
-
 2010-07-06  Murray Cumming  <murrayc murrayc com>
 
 	Added copyright headers. Patch from Kalev Lember.
diff --git a/gtk/gtkmmconfig.h.in b/gtk/gtkmmconfig.h.in
index 9975f57..2b11283 100644
--- a/gtk/gtkmmconfig.h.in
+++ b/gtk/gtkmmconfig.h.in
@@ -25,7 +25,7 @@
 #undef GTKMM_STATIC_LIB
 
 /* Enable DLL-specific stuff only when not building a static library */
-#if (!defined(GTKMM_STATIC_LIB) && !defined(__CYGWIN__) && defined(__MINGW32__))
+#if (!defined(GTKMM_STATIC_LIB) && !defined(__CYGWIN__) && defined(_WIN32))
 # define GTKMM_DLL 1
 #endif
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]