gcc is too aggressively hiding these inlines on wxCriticialSection on osx, expose...

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 6d3d323c4b007ef881e23e7acfd92cea3cd52419..37419c7e80aee6120cd77e45e16f469678a03c11 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"

-DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLIMPEXP_CORE)

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -42,7 +42,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
 
 // TODO: all implementation of wxMask, except the generic one,
 //       do not derive from wxMaskBase,,, they should
 
 // TODO: all implementation of wxMask, except the generic one,
 //       do not derive from wxMaskBase,,, they should

-class WXDLLEXPORT wxMaskBase : public wxObject
+class WXDLLIMPEXP_CORE wxMaskBase : public wxObject

 {
 public:
     // create the mask from bitmap pixels of the given colour
 {
 public:
     // create the mask from bitmap pixels of the given colour


@@ -94,7 +94,7 @@ protected:
 // different formats
 // ----------------------------------------------------------------------------
 
 // different formats
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmapHandler : public wxObject
+class WXDLLIMPEXP_CORE wxBitmapHandler : public wxObject

 {
 public:
     wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; }
 {
 public:
     wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; }


@@ -138,7 +138,7 @@ private:
 // wxBitmap: class which represents platform-dependent bitmap (unlike wxImage)
 // ----------------------------------------------------------------------------
 
 // wxBitmap: class which represents platform-dependent bitmap (unlike wxImage)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmapBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject

 {
 public:
     /*
 {
 public:
     /*


@@ -243,7 +243,7 @@ protected:
 #elif defined(__WXDFB__)
     #include "wx/dfb/bitmap.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXDFB__)
     #include "wx/dfb/bitmap.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/bitmap.h"
+    #include "wx/osx/bitmap.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bitmap.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bitmap.h"
 #elif defined(__WXPM__)