X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..cb8acbd632841a18c69ac6de9e44910e41a5293f:/include/wx/x11/bitmap.h diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index c7a746e2e7..c25b55b8d7 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/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/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -26,15 +22,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 +70,7 @@ private: DECLARE_DYNAMIC_CLASS(wxBitmapHandler) }; -class wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap(); @@ -82,11 +78,9 @@ public: wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); } wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } - wxBitmap( const wxBitmap& bmp ); wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); virtual ~wxBitmap(); - wxBitmap& operator = ( const wxBitmap& bmp ); bool operator == ( const wxBitmap& bmp ) const; bool operator != ( const wxBitmap& bmp ) const; bool Ok() const;