X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e1e6965118640381e57adc373e4817db470e927..5996fb421dc956768bc9a0031051f4c890f6ffa1:/include/wx/os2/bitmap.h diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index 555184acc8..e1953d3034 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -12,10 +12,6 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#ifdef __GNUG__ - #pragma interface "bitmap.h" -#endif - #include "wx/os2/private.h" #include "wx/os2/gdiimage.h" #include "wx/gdicmn.h" @@ -162,6 +158,9 @@ public: virtual bool LoadFile( int nId ,long lType = wxBITMAP_TYPE_BMP_RESOURCE ); + virtual bool LoadFile( const wxString& rName + ,long lType = wxBITMAP_TYPE_XPM + ); virtual bool SaveFile( const wxString& rName ,int lType ,const wxPalette* pCmap = NULL @@ -312,6 +311,12 @@ public: ,int nDesiredWidth ,int nDesiredHeight ); + virtual bool LoadFile( wxBitmap* pBitmap + ,const wxString& rName + ,long lFlags + ,int nDesiredWidth + ,int nDesiredHeight + ); virtual bool SaveFile( wxBitmap* pBitmap ,const wxString& rName ,int lType