delay setting the window shape until it is realized (slightly modified patch 1935497)

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index f828647041c929921677bed98876f37beb73872b..b384ebb03478dae2d41b8a41b6eaf0e9fc42a2fd 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -19,9 +19,11 @@
     #include "wx/gdicmn.h"
     #include "wx/window.h"
     #include "wx/settings.h"
     #include "wx/gdicmn.h"
     #include "wx/window.h"
     #include "wx/settings.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"
+#include "wx/fontutil.h"
+

 #include "wx/os2/private.h"
 
 // the module which is used to clean up wxSystemSettings data (this is a
 #include "wx/os2/private.h"
 
 // the module which is used to clean up wxSystemSettings data (this is a


@@ -69,6 +71,7 @@ void wxSystemSettingsModule::OnExit()
     sm_optionNames.Clear();
     sm_optionValues.Clear();
     delete gs_fontDefault;
     sm_optionNames.Clear();
     sm_optionValues.Clear();
     delete gs_fontDefault;

+    gs_fontDefault = NULL;

 }
 
 wxColour wxSystemSettingsNative::GetColour(
 }
 
 wxColour wxSystemSettingsNative::GetColour(


@@ -200,39 +203,63 @@ wxColour wxSystemSettingsNative::GetColour(
     return(vCol);
 } // end of wxSystemSettingsNative::GetColour
 
     return(vCol);
 } // end of wxSystemSettingsNative::GetColour
 

+// ----------------------------------------------------------------------------
+// fonts
+// ----------------------------------------------------------------------------
+

 wxFont wxSystemSettingsNative::GetFont(
   wxSystemFont                      index
 )
 {
 wxFont wxSystemSettingsNative::GetFont(
   wxSystemFont                      index
 )
 {

-    // TODO
+    const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
+    if ( isDefaultRequested )
+    {
+        if ( gs_fontDefault )
+            return *gs_fontDefault;
+    }
+
+    wxFont font;
+    // FIXME: The mapping could be improved and also OS/2 system fonts
+    // should be taken into account e.g. by using PrfQueryProfileString
+    // to look for PM_System_Fonts in HINI_USERPROFILE.
+    // FIXME2: Creating a font from the native font info does not
+    // seem to work properly.

     switch (index)
     {
     switch (index)
     {

-        case wxSYS_DEVICE_DEFAULT_FONT:
-        {
-            break;
-        }
-        case wxSYS_DEFAULT_PALETTE:
-        {
-            break;
-        }

         case wxSYS_SYSTEM_FIXED_FONT:
         case wxSYS_SYSTEM_FIXED_FONT:

-        {
-            break;
-        }
+        case wxSYS_OEM_FIXED_FONT:
+        case wxSYS_ANSI_FIXED_FONT:
+                font.Create(  10,
+                              wxFONTFAMILY_TELETYPE,
+                              wxFONTSTYLE_NORMAL,
+                              wxFONTWEIGHT_NORMAL   );
+                break;
+        case wxSYS_ANSI_VAR_FONT:
+                font.Create(  10,
+                              wxFONTFAMILY_MODERN,
+                              wxFONTSTYLE_NORMAL,
+                              wxFONTWEIGHT_NORMAL   );
+                break;

         case wxSYS_SYSTEM_FONT:
         case wxSYS_SYSTEM_FONT:

-        {
-            break;
-        }
-        default:

         case wxSYS_DEFAULT_GUI_FONT:
         case wxSYS_DEFAULT_GUI_FONT:

-        {
-            break;
-        }
+                font.Create(  10,
+                              wxFONTFAMILY_SWISS,
+                              wxFONTSTYLE_NORMAL,
+                              wxFONTWEIGHT_NORMAL   );
+                break;
+        default:
+                wxFAIL_MSG( _T("stock font not found") );
+                return GetFont(wxSYS_ANSI_VAR_FONT);
+    }
+
+
+    if ( isDefaultRequested )
+    {
+        // if we got here it means we hadn't cached it yet - do now
+        gs_fontDefault = new wxFont(font);

     }
     }

-    if(wxSWISS_FONT)
-         return *wxSWISS_FONT;

 
 

-    return wxNullFont;
+    return font;

 }
 
 // Get a system metric, e.g. scrollbar size
 }
 
 // Get a system metric, e.g. scrollbar size