test program improvements (patch 927429)

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 6b834f3abaa67ab15bf378d3827ad125a30f0027..9c9714914b5eaebde7163889f9e7858f9059ef51 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -55,7 +55,7 @@ bool wxControlBase::Create(wxWindow *parent,
                            const wxPoint &pos,
                            const wxSize &size,
                            long style,
                            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);
                            const wxString &name)
 {
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);


@@ -92,22 +92,15 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
 // inherit colour and font settings from the parent window
 void wxControlBase::InheritAttributes()
 {
 // 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
+    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 wxControlBase::Command(wxCommandEvent& event)