X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c90c34007a72d942f378e46b77e4f4456ac9c5b1..6a5c9b3ff71334ed30bd9ae15425a1ca8ae71174:/include/wx/os2/bitmap.h?ds=sidebyside diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index 5b5e917b4d..eba49f641b 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" @@ -74,7 +70,11 @@ public: // Copy constructors inline wxBitmap(const wxBitmap& rBitmap) - { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); } + : wxGDIImage(rBitmap) + { + Init(); + SetHandle(rBitmap.GetHandle()); + } // Initialize with raw data wxBitmap( const char bits[] @@ -116,13 +116,6 @@ public: inline wxBitmap(const wxIcon& rIcon) { Init(); CopyFromIcon(rIcon); } - wxBitmap& operator=(const wxBitmap& rBitmap) - { - if ( m_refData != rBitmap.m_refData ) - Ref(rBitmap); - return(*this); - } - wxBitmap& operator=(const wxIcon& rIcon) { (void)CopyFromIcon(rIcon);