X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b7c01c976a2fd8a6ca3e46aab827dbc0b0e8da9..d2b23b67301bd2d286366d4326a21da3132558fa:/src/msw/bitmap.cpp diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 20a2aa22b9..8ef2b8b3f3 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -1164,15 +1164,6 @@ wxDC *wxBitmap::GetSelectedInto() const #endif -#if WXWIN_COMPATIBILITY_2_4 - -int wxBitmap::GetQuality() const -{ - return 0; -} - -#endif // WXWIN_COMPATIBILITY_2_4 - void wxBitmap::UseAlpha() { if ( GetBitmapData() ) @@ -1216,14 +1207,6 @@ void wxBitmap::SetMask(wxMask *mask) GetBitmapData()->SetMask(mask); } -#if WXWIN_COMPATIBILITY_2_4 - -void wxBitmap::SetQuality(int WXUNUSED(quality)) -{ -} - -#endif // WXWIN_COMPATIBILITY_2_4 - // ---------------------------------------------------------------------------- // raw bitmap access support // ---------------------------------------------------------------------------- @@ -1347,6 +1330,7 @@ wxMask::wxMask() // Copy constructor wxMask::wxMask(const wxMask &mask) + : wxObject() { BITMAP bmp; @@ -1370,7 +1354,7 @@ wxMask::wxMask(const wxMask &mask) SelectObject(destDC, (HBITMAP) m_maskBitmap); BitBlt(destDC, 0, 0, w, h, srcDC, 0, 0, SRCCOPY); - + SelectObject(srcDC, 0); DeleteDC(srcDC); SelectObject(destDC, 0);