X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6f4144e596cdf8e862e513b7f7c09022a664137..73302af6dddd667af4ebec69c800bc9de106f28e:/include/wx/os2/bitmap.h diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index 10f0464f38..ca736176ea 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -74,7 +74,7 @@ public: // Copy constructors inline wxBitmap(const wxBitmap& rBitmap) - { Init(); Ref(rBitmap); } + { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); } // Initialize with raw data wxBitmap( const char bits[] @@ -194,19 +194,6 @@ public: inline bool operator!=(const wxBitmap& rBitmap) const { return m_refData != rBitmap.m_refData; } -#if WXWIN_COMPATIBILITY_2 - void SetOk(bool bIsOk); -#endif // WXWIN_COMPATIBILITY_2 - -#if WXWIN_COMPATIBILITY - inline wxPalette* GetColourMap() const - { return GetPalette(); } - - inline void SetColourMap(wxPalette* pCmap) - { SetPalette(*pCmap); }; - -#endif // WXWIN_COMPATIBILITY - // Implementation public: inline void SetHBITMAP(WXHBITMAP hBmp) @@ -223,14 +210,9 @@ public: inline bool IsMono(void) const { return m_bIsMono; } - // An OS/2 version that probably doesn't do anything like the msw version wxBitmap GetBitmapForDC(wxDC& rDc) const; -// inline LONG GetId() const -// { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); } - - protected: // common part of all ctors void Init();