X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2b31b87fbac61af6eb96f3f5fa960ee4479bb1d..8a1554ed3c90e6d816c740639ecd946020f09bd5:/src/msw/panel.cpp?ds=sidebyside diff --git a/src/msw/panel.cpp b/src/msw/panel.cpp index c502caf9f5..fc7cfa5bb1 100644 --- a/src/msw/panel.cpp +++ b/src/msw/panel.cpp @@ -3,7 +3,6 @@ // Purpose: Implementation of wxMSW-specific wxPanel class. // Author: Vadim Zeitlin // Created: 2011-03-18 -// RCS-ID: $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -24,8 +23,6 @@ #endif #ifndef WX_PRECOMP - #include "wx/bitmap.h" - #include "wx/brush.h" #include "wx/panel.h" #endif // WX_PRECOMP @@ -33,11 +30,6 @@ // implementation // ============================================================================ -wxPanel::~wxPanel() -{ - delete m_backgroundBrush; -} - bool wxPanel::HasTransparentBackground() { for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) @@ -52,21 +44,3 @@ bool wxPanel::HasTransparentBackground() return false; } -void wxPanel::DoSetBackgroundBitmap(const wxBitmap& bmp) -{ - delete m_backgroundBrush; - m_backgroundBrush = bmp.IsOk() ? new wxBrush(bmp) : NULL; - - // Our transparent children should use our background if we have it, - // otherwise try to restore m_inheritBgCol to some reasonable value: true - // if we also have non-default background colour or false otherwise. - m_inheritBgCol = bmp.IsOk() || UseBgCol(); -} - -WXHBRUSH wxPanel::MSWGetCustomBgBrush() -{ - if ( m_backgroundBrush ) - return (WXHBRUSH)m_backgroundBrush->GetResourceHandle(); - - return wxPanelBase::MSWGetCustomBgBrush(); -}