Somehow, setting a tint color makes gauge work :/.

[wxWidgets.git] / include / wx / dlimpexp.h

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 12e98fea543a9a91d44db51ec3404ea126c4a1dd..b745fe6fe70c2569d24ef03c210c176dc3ee329c 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -4,7 +4,6 @@
  * Author:      Vadim Zeitlin
  * Modified by:
  * Created:     16.10.2003 (extracted from wx/defs.h)
- * RCS-ID:      $Id$
  * Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
@@ -24,7 +23,7 @@
        __declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well
        as VC++.
      */
-#    if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#    if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) || (defined(__WINDOWS__) && defined(__INTELC__))
 #        define WXEXPORT __declspec(dllexport)
 #        define WXIMPORT __declspec(dllimport)
     /*
@@ -57,11 +56,6 @@
 #        define WXEXPORT _Export
 #        define WXIMPORT _Export
 #    endif
-#elif defined(__WXMAC__) || defined(__WXCOCOA__)
-#    ifdef __MWERKS__
-#        define WXEXPORT __declspec(export)
-#        define WXIMPORT __declspec(import)
-#    endif
 #elif defined(__CYGWIN__)
 #    define WXEXPORT __declspec(dllexport)
 #    define WXIMPORT __declspec(dllimport)
@@ -97,12 +91,12 @@
 #    define WXMAKINGDLL_XML
 #    define WXMAKINGDLL_XRC
 #    define WXMAKINGDLL_AUI
-#    define WXMAKINGDLL_RIBBON
 #    define WXMAKINGDLL_PROPGRID
+#    define WXMAKINGDLL_RIBBON
 #    define WXMAKINGDLL_RICHTEXT
 #    define WXMAKINGDLL_MEDIA
 #    define WXMAKINGDLL_STC
-#    define WXMAKINGDLL_WEB
+#    define WXMAKINGDLL_WEBVIEW
 #endif /* WXMAKINGDLL */
 
 /*
@@ -229,14 +223,6 @@
 #    define WXDLLIMPEXP_AUI
 #endif
 
-#ifdef WXMAKINGDLL_RIBBON
-#    define WXDLLIMPEXP_RIBBON WXEXPORT
-#elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_RIBBON WXIMPORT
-#else /* not making nor using DLL */
-#    define WXDLLIMPEXP_RIBBON
-#endif
-
 #ifdef WXMAKINGDLL_PROPGRID
 #    define WXDLLIMPEXP_PROPGRID WXEXPORT
 #    define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type
@@ -248,6 +234,14 @@
 #    define WXDLLIMPEXP_DATA_PROPGRID(type) type
 #endif
 
+#ifdef WXMAKINGDLL_RIBBON
+#    define WXDLLIMPEXP_RIBBON WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_RIBBON WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_RIBBON
+#endif
+
 #ifdef WXMAKINGDLL_RICHTEXT
 #    define WXDLLIMPEXP_RICHTEXT WXEXPORT
 #elif defined(WXUSINGDLL)
@@ -275,15 +269,15 @@
 #    define WXDLLIMPEXP_DATA_STC(type) type
 #endif
 
-#ifdef WXMAKINGDLL_WEB
-#    define WXDLLIMPEXP_WEB WXEXPORT
-#    define WXDLLIMPEXP_DATA_WEB(type) WXEXPORT type
+#ifdef WXMAKINGDLL_WEBVIEW
+#    define WXDLLIMPEXP_WEBVIEW WXEXPORT
+#    define WXDLLIMPEXP_DATA_WEBVIEW(type) WXEXPORT type
 #elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_WEB WXIMPORT
-#    define WXDLLIMPEXP_DATA_WEB(type) WXIMPORT type
+#    define WXDLLIMPEXP_WEBVIEW WXIMPORT
+#    define WXDLLIMPEXP_DATA_WEBVIEW(type) WXIMPORT type
 #else /* not making nor using DLL */
-#    define WXDLLIMPEXP_WEB
-#    define WXDLLIMPEXP_DATA_WEB(type) type
+#    define WXDLLIMPEXP_WEBVIEW
+#    define WXDLLIMPEXP_DATA_WEBVIEW(type) type
 #endif
 
 /*
@@ -304,10 +298,11 @@
     #define WXDLLIMPEXP_FWD_XRC
     #define WXDLLIMPEXP_FWD_AUI
     #define WXDLLIMPEXP_FWD_PROPGRID
+    #define WXDLLIMPEXP_FWD_RIBBON
     #define WXDLLIMPEXP_FWD_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA
     #define WXDLLIMPEXP_FWD_STC
-    #define WXDLLIMPEXP_FWD_WEB
+    #define WXDLLIMPEXP_FWD_WEBVIEW
 #else
     #define WXDLLIMPEXP_FWD_BASE      WXDLLIMPEXP_BASE
     #define WXDLLIMPEXP_FWD_NET       WXDLLIMPEXP_NET
@@ -320,10 +315,11 @@
     #define WXDLLIMPEXP_FWD_XRC       WXDLLIMPEXP_XRC
     #define WXDLLIMPEXP_FWD_AUI       WXDLLIMPEXP_AUI
     #define WXDLLIMPEXP_FWD_PROPGRID  WXDLLIMPEXP_PROPGRID
+    #define WXDLLIMPEXP_FWD_RIBBON    WXDLLIMPEXP_RIBBON
     #define WXDLLIMPEXP_FWD_RICHTEXT  WXDLLIMPEXP_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA     WXDLLIMPEXP_MEDIA
     #define WXDLLIMPEXP_FWD_STC       WXDLLIMPEXP_STC
-    #define WXDLLIMPEXP_FWD_WEB       WXDLLIMPEXP_WEB
+    #define WXDLLIMPEXP_FWD_WEBVIEW   WXDLLIMPEXP_WEBVIEW
 #endif
 
 /* for backwards compatibility, define suffix-less versions too */