multilib mode

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 97ea795e5756707e35a3a98c441af472579bbd79..d42a8ff04aec1a73d99a483de09f5fb2a2cd24af 100644 (file)
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -45,6 +45,11 @@
 // implementation
 // ============================================================================
 
+wxControlBase::~wxControlBase()
+{
+    // this destructor is required for Darwin
+}
+
 bool wxControlBase::Create(wxWindow *parent,
                            wxWindowID id,
                            const wxPoint &pos,
@@ -87,9 +92,22 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
 // inherit colour and font settings from the parent window
 void wxControlBase::InheritAttributes()
 {
+    // it definitely doesn't make sense to inherit the background colour as the
+    // controls typically have their own standard one and probably not the
+    // foreground neither?
+#if 0
     SetBackgroundColour(GetParent()->GetBackgroundColour());
     SetForegroundColour(GetParent()->GetForegroundColour());
+#endif // 0
+
+#ifdef __WXPM__
+    //
+    // All OS/2 ctrls use the small font
+    //
+    SetFont(*wxSMALL_FONT);
+#else
     SetFont(GetParent()->GetFont());
+#endif
 }
 
 void wxControlBase::Command(wxCommandEvent& event)
@@ -125,6 +143,11 @@ void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
 
 #if wxUSE_STATBMP
 
+wxStaticBitmapBase::~wxStaticBitmapBase()
+{
+    // this destructor is required for Darwin
+}
+
 wxSize wxStaticBitmapBase::DoGetBestClientSize() const
 {
     wxBitmap bmp = GetBitmap();