X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6298b8d0b20bd2beafcff397d75cc67f18bd850e..72e4e6a397fd04e6d8e0cc5ae22aaba740c3c8bc:/include/wx/x11/bitmap.h

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index c9d96ad944..5d01d42685 100644
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "bitmap.h"
 #endif
 
@@ -26,15 +26,15 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxMask;
-class wxBitmap;
-class wxImage;
+class WXDLLIMPEXP_CORE wxMask;
+class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxImage;
 
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
 
-class wxMask: public wxObject
+class WXDLLIMPEXP_CORE wxMask: public wxObject
 {
 public:
     wxMask();
@@ -74,7 +74,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 };
 
-class wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:
     wxBitmap();
@@ -96,6 +96,8 @@ public:
     bool Create(int width, int height, int depth = -1);
     bool Create(void* data, wxBitmapType type,
                 int width, int height, int depth = -1);
+    // create the wxBitmap using a _copy_ of the pixmap
+    bool Create(WXPixmap pixmap);
 
     int GetHeight() const;
     int GetWidth() const;