better focus handling (blind fix)

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

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 9d868d66b7dca7b7152336ddacd7aa7f392318ff..360e8a2fc3c618f9404453a47f05e578dcde3d05 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -40,6 +40,7 @@
 #include "wx/window.h"
 #include "wx/msw/private.h"
 #include "wx/module.h"
 #include "wx/window.h"
 #include "wx/msw/private.h"
 #include "wx/module.h"

+#include "wx/fontutil.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -49,6 +50,7 @@
 // singleton class so it can't be done in the dtor)
 class wxSystemSettingsModule : public wxModule
 {
 // singleton class so it can't be done in the dtor)
 class wxSystemSettingsModule : public wxModule
 {

+    friend class wxSystemSettings;

 public:
     virtual bool OnInit();
     virtual void OnExit();
 public:
     virtual bool OnInit();
     virtual void OnExit();


@@ -81,6 +83,7 @@ bool wxSystemSettingsModule::OnInit()
 void wxSystemSettingsModule::OnExit()
 {
     delete gs_fontDefault;
 void wxSystemSettingsModule::OnExit()
 {
     delete gs_fontDefault;

+    gs_fontDefault = NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -108,16 +111,8 @@ wxColour wxSystemSettings::GetSystemColour(int index)
     }
 }
 
     }
 }
 

-wxFont wxSystemSettings::GetSystemFont(int index)
+wxFont wxCreateFontFromStockObject(int index)

 {
 {

-    // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
-    // called fairly often - this is why we cache this particular font
-    bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
-    if ( isDefaultRequested && gs_fontDefault )
-    {
-        return *gs_fontDefault;
-    }
-

     wxFont font;
 
     HFONT hFont = (HFONT) ::GetStockObject(index);
     wxFont font;
 
     HFONT hFont = (HFONT) ::GetStockObject(index);


@@ -126,7 +121,16 @@ wxFont wxSystemSettings::GetSystemFont(int index)
         LOGFONT lf;
         if ( ::GetObject(hFont, sizeof(LOGFONT), &lf) != 0 )
         {
         LOGFONT lf;
         if ( ::GetObject(hFont, sizeof(LOGFONT), &lf) != 0 )
         {

-            font = wxCreateFontFromLogFont(&lf);
+            wxNativeFontInfo info;
+            info.lf = lf;
+            // Under MicroWindows we pass the HFONT as well
+            // because it's hard to convert HFONT -> LOGFONT -> HFONT
+            // It's OK to delete stock objects, the delete will be ignored.
+#ifdef __WXMICROWIN__
+            font.Create(info, (WXHFONT) hFont);
+#else
+            font.Create(info);
+#endif

         }
         else
         {
         }
         else
         {


@@ -137,6 +141,20 @@ wxFont wxSystemSettings::GetSystemFont(int index)
     {
         wxFAIL_MSG( _T("stock font not found") );
     }
     {
         wxFAIL_MSG( _T("stock font not found") );
     }

+    return font;
+}
+
+wxFont wxSystemSettings::GetSystemFont(int index)
+{
+    // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
+    // called fairly often - this is why we cache this particular font
+    bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
+    if ( isDefaultRequested && gs_fontDefault )
+    {
+        return *gs_fontDefault;
+    }
+
+    wxFont font = wxCreateFontFromStockObject(index);

 
     if ( isDefaultRequested )
     {
 
     if ( isDefaultRequested )
     {


@@ -150,6 +168,10 @@ wxFont wxSystemSettings::GetSystemFont(int index)
 // Get a system metric, e.g. scrollbar size
 int wxSystemSettings::GetSystemMetric(int index)
 {
 // Get a system metric, e.g. scrollbar size
 int wxSystemSettings::GetSystemMetric(int index)
 {

+#ifdef __WXMICROWIN__
+    // TODO: probably use wxUniv themes functionality
+    return 0;
+#else

     switch ( index)
     {
 #ifdef __WIN32__
     switch ( index)
     {
 #ifdef __WIN32__


@@ -241,5 +263,7 @@ int wxSystemSettings::GetSystemMetric(int index)
         default:
             return 0;
     }
         default:
             return 0;
     }

+#endif
+    // __WXMICROWIN__

 }
 
 }