build fixes after previous commit

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 6572a219c03411fa3db236f43830b900a53a25ea..54fd80129e90f585004794496391bf0bca7f8156 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -162,6 +162,10 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         return false;
     }
 
+    // saving the label in m_labelOrig to return it verbatim
+    // later in GetLabel()
+    m_labelOrig = label;
+
     // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 
@@ -169,11 +173,27 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     InheritAttributes();
     if ( !m_hasFont )
     {
-#if wxUSE_LISTCTRL || wxUSE_TREECTRL
+        bool setFont = true;
+
+        wxFont font = GetDefaultAttributes().font;
+
         // if we set a font for {list,tree}ctrls and the font size is changed in
         // the display properties then the font size for these controls doesn't
         // automatically adjust when they receive WM_SETTINGCHANGE
-        if ( wxDynamicCastThis(wxListCtrl) || wxDynamicCastThis(wxTreeCtrl) )
+
+        // FIXME: replace the dynamic casts with virtual function calls!!
+#if wxUSE_LISTCTRL || wxUSE_TREECTRL
+        bool testFont = false;
+#if wxUSE_LISTCTRL
+        if ( wxDynamicCastThis(wxListCtrl) )
+            testFont = true;
+#endif // wxUSE_LISTCTRL
+#if wxUSE_TREECTRL
+        if ( wxDynamicCastThis(wxTreeCtrl) )
+            testFont = true;
+#endif // wxUSE_TREECTRL
+
+        if ( testFont )
         {
             // not sure if we need to explicitly set the font here for Win95/NT4
             // but we definitely can't do it for any newer version
@@ -182,21 +202,21 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 
             // TODO: test Win95/NT4 to see if this is needed or breaks the
             // font resizing as it does on newer versions
-            wxFont font = GetDefaultAttributes().font;
-            if ( font == wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) )
+            if ( font != wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) )
             {
-                SetFont(font);
+                setFont = false;
             }
         }
-        else
 #endif // wxUSE_LISTCTRL || wxUSE_TREECTRL
+
+        if ( setFont )
         {
             SetFont(GetDefaultAttributes().font);
         }
     }
 
     // set the size now if no initial size specified
-    SetInitialBestSize(size);
+    SetInitialSize(size);
 
     return true;
 }
@@ -221,7 +241,7 @@ WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);
 
-    if ( AcceptsFocus() )
+    if ( AcceptsFocusFromKeyboard() )
     {
         msStyle |= WS_TABSTOP;
     }
@@ -382,14 +402,15 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
 
         hbr = (WXHBRUSH)brush->GetResourceHandle();
 
-        // if we use custom background, we should set foreground ourselves too
-        if ( !m_hasFgCol )
-        {
-            ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
-        }
-        //else: already set above
     }
 
+    // if we use custom background, we should set foreground ourselves too
+    if ( hbr && !m_hasFgCol )
+    {
+        ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
+    }
+    //else: already set above
+
     return hbr;
 }