X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6298b8d0b20bd2beafcff397d75cc67f18bd850e..254fbd140e67b60f46d7380c6ac242110ddd7585:/include/wx/x11/bitmap.h diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index c9d96ad944..c7a746e2e7 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 @@ -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;