adaptions to m_peer methods

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

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 2531dd54c90825bb6db49e71ced811cde63c3575..a2a61fc04a5e2cbca01a22b5b7aba9414e49862d 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -372,7 +372,8 @@ bool wxSpinCtrl::Create(wxWindow *parent,
 
     // set up fonts and colours  (This is nomally done in MSWCreateControl)
     InheritAttributes();
-    SetFont(GetDefaultAttributes().font);
+    if (!m_hasFont)
+        SetFont(GetDefaultAttributes().font);
 
     // set the size of the text window - can do it only now, because we
     // couldn't call DoGetBestSize() before as font wasn't set
@@ -384,8 +385,6 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         sizeText.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
     }
 
-    //DoMoveWindow(pos.x, pos.y,
-    //             sizeText.x + sizeBtn.x + MARGIN_BETWEEN, sizeText.y);
     SetBestSize(size);
 
     (void)::ShowWindow(GetBuddyHwnd(), SW_SHOW);