scroll of subwindow confined to rect param

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index a61beaa16c07f5fe1a1d4251f9b76ce34040b794..ec97111188ae4c169cf3eaea1a9bdae455c3ad49 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
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "controlbase.h"
     #pragma implementation "statbmpbase.h"
 #endif
     #pragma implementation "controlbase.h"
     #pragma implementation "statbmpbase.h"
 #endif


@@ -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,9 +92,24 @@ 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()
 {

-    SetBackgroundColour(GetParent()->GetBackgroundColour());
-    SetForegroundColour(GetParent()->GetForegroundColour());
+    if ( ShouldInheritColours() )
+    {
+        wxWindow *parent = GetParent();
+
+        wxCHECK_RET( parent, _T("a control without parent?") );
+
+        SetBackgroundColour(parent->GetBackgroundColour());
+        SetForegroundColour(parent->GetForegroundColour());
+    }
+
+#ifdef __WXPM__
+    //
+    // All OS/2 ctrls use the small font
+    //
+    SetFont(*wxSMALL_FONT);
+#else

     SetFont(GetParent()->GetFont());
     SetFont(GetParent()->GetFont());

+#endif

 }
 
 void wxControlBase::Command(wxCommandEvent& event)
 }
 
 void wxControlBase::Command(wxCommandEvent& event)