X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58c837a4e67c0996134cc0947691dc09c5f26687..487c1f7ef2ad59cf8ed6d8aca317d20304ca27bd:/src/common/gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index d0f6c4199d..eb97decf64 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -50,7 +50,6 @@
 #endif
 #endif
 
-#if !USE_SHARED_LIBRARY
     IMPLEMENT_CLASS(wxColourDatabase, wxList)
     IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
     IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
@@ -59,7 +58,6 @@
     IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
 
     IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
-#endif
 
 wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
@@ -360,10 +358,17 @@ void wxInitializeStockObjects ()
   //  wxFontPool = new XFontPool;
 #endif
 
-  wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
-  wxSMALL_FONT = new wxFont (10, wxSWISS, wxNORMAL, wxNORMAL);
-  wxITALIC_FONT = new wxFont (12, wxROMAN, wxITALIC, wxNORMAL);
-  wxSWISS_FONT = new wxFont (12, wxSWISS, wxNORMAL, wxNORMAL);
+  // why under MSW fonts shouldn't have the standard system size?
+#ifdef __WXMSW__
+  static const int sizeFont = 10;
+#else
+  static const int sizeFont = 12;
+#endif
+
+  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
+  wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
+  wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
+  wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL);
 
   wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
   wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);