X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..7fa4dc1cfcc55b0fe425a3ebe5e992ff8255481b:/src/common/ctrlcmn.cpp?ds=inline

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 97ea795e57..de49faed12 100644
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "controlbase.h"
     #pragma implementation "statbmpbase.h"
 #endif
@@ -45,12 +45,17 @@
 // implementation
 // ============================================================================
 
+wxControlBase::~wxControlBase()
+{
+    // this destructor is required for Darwin
+}
+
 bool wxControlBase::Create(wxWindow *parent,
                            wxWindowID id,
                            const wxPoint &pos,
                            const wxSize &size,
                            long style,
-                           const wxValidator& validator,
+                           const wxValidator& wxVALIDATOR_PARAM(validator),
                            const wxString &name)
 {
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
@@ -84,14 +89,6 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
     return TRUE;
 }
 
-// inherit colour and font settings from the parent window
-void wxControlBase::InheritAttributes()
-{
-    SetBackgroundColour(GetParent()->GetBackgroundColour());
-    SetForegroundColour(GetParent()->GetForegroundColour());
-    SetFont(GetParent()->GetFont());
-}
-
 void wxControlBase::Command(wxCommandEvent& event)
 {
     (void)GetEventHandler()->ProcessEvent(event);
@@ -125,7 +122,12 @@ void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
 
 #if wxUSE_STATBMP
 
-wxSize wxStaticBitmapBase::DoGetBestClientSize() const
+wxStaticBitmapBase::~wxStaticBitmapBase()
+{
+    // this destructor is required for Darwin
+}
+
+wxSize wxStaticBitmapBase::DoGetBestSize() const
 {
     wxBitmap bmp = GetBitmap();
     if ( bmp.Ok() )