Linux/AXP compilation fixed.

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 26181e21b21c92728be9f5e1a50e669c9a113acd..18e1821bfc1ae89d2c64a2f2a48d245c432d5cda 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?
 
     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?
     m_font = *wxSWISS_FONT;         //      and this?

-
+#else
+       m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+#endif

     // no style bits
     m_windowStyle = 0;
 
     // no style bits
     m_windowStyle = 0;
 


@@ -351,6 +354,7 @@ void wxWindowBase::Centre(int direction)
         yNew += posParent.y;
     }
 
         yNew += posParent.y;
     }
 

+    // move the centre of this window to this position

     Move(xNew, yNew);
 }
 
     Move(xNew, yNew);
 }