wxTimer/timercmn.cpp change

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 26181e21b21c92728be9f5e1a50e669c9a113acd..9cad968ed4eb27107557a43ecd39cd2f097ce6d2 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -119,8 +119,11 @@ void wxWindowBase::InitBase()
 
     m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE);
     m_foregroundColour = *wxBLACK;  // TODO take this from sys settings too?
+#ifndef __WXMAC__
     m_font = *wxSWISS_FONT;         //      and this?
-
+#else
+       m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+#endif
     // no style bits
     m_windowStyle = 0;
 
@@ -351,7 +354,9 @@ void wxWindowBase::Centre(int direction)
         yNew += posParent.y;
     }
 
-    Move(xNew, yNew);
+    // move the centre of this window to this position (not the upper left
+    // corner as it was done before)
+    Move(xNew - width / 2, yNew - height / 2);
 }
 
 // fits the window around the children