X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ca21fe7bfda18e2da4e17eb529c4dfa0c824db2..777469ca936965a1ed15f70f3fe81f665833bf6a:/src/msw/bitmap.cpp diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 05d24b6d82..61ad4d25f8 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -1173,13 +1172,6 @@ wxMask *wxBitmap::GetMask() const return GetBitmapData() ? GetBitmapData()->GetMask() : NULL; } -wxBitmap wxMask::GetBitmap() const -{ - wxBitmap bmp; - bmp.SetHBITMAP(m_maskBitmap); - return bmp; -} - wxDC *wxBitmap::GetSelectedInto() const { #if wxDEBUG_LEVEL @@ -1547,6 +1539,13 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) #endif // __WXMICROWIN__/!__WXMICROWIN__ } +wxBitmap wxMask::GetBitmap() const +{ + wxBitmap bmp; + bmp.SetHBITMAP(m_maskBitmap); + return bmp; +} + // ---------------------------------------------------------------------------- // wxBitmapHandler // ----------------------------------------------------------------------------