[wxGTK] Support changing the wxSTAY_ON_TOP style value run-time through wxWindow...

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

diff --git a/include/wx/mac/carbon/bitmap.h b/include/wx/mac/carbon/bitmap.h
index 054249c602d4d6817d49e42a1ee8fdc122930125..64bc3dad0481efd5ad642485fba222043f6841b9 100644 (file)
--- a/include/wx/mac/carbon/bitmap.h
+++ b/include/wx/mac/carbon/bitmap.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma interface "bitmap.h"
-#endif
-
 #include "wx/palette.h"
 
 // Bitmap
@@ -110,7 +106,10 @@ public:
 
     // Copy constructors
     wxBitmap(const wxBitmap& bitmap)
-    { Ref(bitmap); }
+        : wxBitmapBase()
+    {
+        Ref(bitmap);
+    }
 
     // Initialize with raw data.
     wxBitmap(const char bits[], int width, int height, int depth = 1);
@@ -196,7 +195,7 @@ public:
     // returns the 'native' implementation, a GWorldPtr for the content and one for the mask 
     WXHBITMAP GetHBITMAP( WXHBITMAP * mask = NULL ) const;
 
-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__
     // returns a CGImageRef which must released after usage with CGImageRelease
     WXCGIMAGEREF CGImageCreate() const ;
 #endif