wxEncodingConverter should and can be compiled

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

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index c9d96ad944865b414dce934c41871be6b0e2c76e..c7a746e2e738c023e91730ebc214039065a8e921 100644 (file)
--- 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
 
@@ -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;