Save the alpha values if the image has an alpha channel

[wxWidgets.git] / src / common / ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 9c9714914b5eaebde7163889f9e7858f9059ef51..242efdca1f1c05ec55bcd4904cf0cc9bfe1bb29e 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -89,20 +89,6 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

-// inherit colour and font settings from the parent window
-void wxControlBase::InheritAttributes()
-{
-    if ( ShouldInheritColours() )
-    {
-        wxWindow *parent = GetParent();
-
-        wxCHECK_RET( parent, _T("a control without parent?") );
-
-        SetBackgroundColour(parent->GetBackgroundColour());
-        SetForegroundColour(parent->GetForegroundColour());
-    }
-}
-

 void wxControlBase::Command(wxCommandEvent& event)
 {
     (void)GetEventHandler()->ProcessEvent(event);
 void wxControlBase::Command(wxCommandEvent& event)
 {
     (void)GetEventHandler()->ProcessEvent(event);


@@ -141,7 +127,7 @@ wxStaticBitmapBase::~wxStaticBitmapBase()
     // this destructor is required for Darwin
 }
 
     // this destructor is required for Darwin
 }
 

-wxSize wxStaticBitmapBase::DoGetBestClientSize() const
+wxSize wxStaticBitmapBase::DoGetBestSize() const

 {
     wxBitmap bmp = GetBitmap();
     if ( bmp.Ok() )
 {
     wxBitmap bmp = GetBitmap();
     if ( bmp.Ok() )