fix for wxSYS_COLOUR_LISTBOX representation

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

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index bfdb3d75061331660a7af9e0c09c5eb10ee8473f..3e55d24dfeed9f3f708062e43c36ac9efc5a2d17 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        settings.cpp
-// Purpose:     wxSettings
+// Name:        msw/settings.cpp
+// Purpose:     wxSystemSettingsNative implementation for MSW

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98


@@ -9,29 +9,60 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "settings.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/gdicmn.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #include "wx/settings.h"
 #endif
 
 #include "wx/settings.h"

-#include "wx/window.h"
+

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

+#include "wx/module.h"
+#include "wx/fontutil.h"
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// the module which is used to clean up wxSystemSettingsNative data (this is a
+// singleton class so it can't be done in the dtor)
+class wxSystemSettingsModule : public wxModule
+{
+public:
+    virtual bool OnInit();
+    virtual void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
+};
+
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+// the font returned by GetFont(wxSYS_DEFAULT_GUI_FONT): it is created when
+// GetFont() is called for the first time and deleted by wxSystemSettingsModule
+static wxFont *gs_fontDefault = NULL;
+
+// ============================================================================
+// implementation
+// ============================================================================
+

 // TODO: see ::SystemParametersInfo for all sorts of Windows settings.
 // Different args are required depending on the id. How does this differ
 // from GetSystemMetric, and should it? Perhaps call it GetSystemParameter
 // TODO: see ::SystemParametersInfo for all sorts of Windows settings.
 // Different args are required depending on the id. How does this differ
 // from GetSystemMetric, and should it? Perhaps call it GetSystemParameter


@@ -39,135 +70,210 @@
 // Should also have SetSystemParameter.
 // Also implement WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
 
 // Should also have SetSystemParameter.
 // Also implement WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
 

-wxColour wxSystemSettings::GetSystemColour(int index)
+// ----------------------------------------------------------------------------
+// wxSystemSettingsModule
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
+
+bool wxSystemSettingsModule::OnInit()

 {
 {

-    switch (index)
-    {
-        case wxSYS_COLOUR_LISTBOX:
-            return *wxWHITE;
-    
-        default:
-            COLORREF ref = ::GetSysColor(index);
-            wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
-            return col;
-    }
+    return TRUE;
+}
+
+void wxSystemSettingsModule::OnExit()
+{
+    delete gs_fontDefault;
+    gs_fontDefault = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// wxSystemSettingsNative
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// colours
+// ----------------------------------------------------------------------------
+
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
+{
+    wxColour col;
+    wxRGBToColour(col, ::GetSysColor(index));
+    return col;

 }
 
 }
 

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

 {
 {

+    wxFont font;
+

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

-    if ( hFont != (HFONT) NULL )
+    if ( hFont )

     {
         LOGFONT lf;
         if ( ::GetObject(hFont, sizeof(LOGFONT), &lf) != 0 )
         {
     {
         LOGFONT lf;
         if ( ::GetObject(hFont, sizeof(LOGFONT), &lf) != 0 )
         {

-            // In fontdlg.cpp
-            return 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
         {

-            return wxNullFont;
+            wxFAIL_MSG( _T("failed to get LOGFONT") );

         }
     }
         }
     }

-    else
+    else // GetStockObject() failed

     {
     {

-        return wxNullFont;
+        wxFAIL_MSG( _T("stock font not found") );

     }
     }

+
+    return font;

 }
 
 }
 

-// Get a system metric, e.g. scrollbar size
-int wxSystemSettings::GetSystemMetric(int index)
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)

 {
 {

-    switch ( 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 we got here it means we hadn't cached it yet - do now
+        gs_fontDefault = new wxFont(font);
+    }
+
+    return font;
+}
+
+// ----------------------------------------------------------------------------
+// system metrics/features
+// ----------------------------------------------------------------------------
+
+// TODO: some of the "metrics" clearly should be features now that we have
+//       HasFeature()!
+
+// the conversion table from wxSystemMetric enum to GetSystemMetrics() param
+//
+// if the constant is not defined, put -1 in the table to indicate that it is
+// unknown
+static const int gs_metricsMap[] =
+{
+    -1,  // wxSystemMetric enums start at 1, so give a dummy value for pos 0.

 #ifdef __WIN32__
 #ifdef __WIN32__

-        case wxSYS_MOUSE_BUTTONS:
-            return ::GetSystemMetrics(SM_CMOUSEBUTTONS);
+    SM_CMOUSEBUTTONS,
+#else
+    -1,

 #endif
 
 #endif
 

-        case wxSYS_BORDER_X:
-            return ::GetSystemMetrics(SM_CXBORDER);
-        case wxSYS_BORDER_Y:
-            return ::GetSystemMetrics(SM_CYBORDER);
-        case wxSYS_CURSOR_X:
-            return ::GetSystemMetrics(SM_CXCURSOR);
-        case wxSYS_CURSOR_Y:
-            return ::GetSystemMetrics(SM_CYCURSOR);
-        case wxSYS_DCLICK_X:
-            return ::GetSystemMetrics(SM_CXDOUBLECLK);
-        case wxSYS_DCLICK_Y:
-            return ::GetSystemMetrics(SM_CYDOUBLECLK);
+    SM_CXBORDER,
+    SM_CYBORDER,
+    SM_CXCURSOR,
+    SM_CYCURSOR,
+    SM_CXDOUBLECLK,
+    SM_CYDOUBLECLK,

 #if defined(__WIN32__) && defined(SM_CXDRAG)
 #if defined(__WIN32__) && defined(SM_CXDRAG)

-        case wxSYS_DRAG_X:
-            return ::GetSystemMetrics(SM_CXDRAG);
-        case wxSYS_DRAG_Y:
-            return ::GetSystemMetrics(SM_CYDRAG);
-        case wxSYS_EDGE_X:
-            return ::GetSystemMetrics(SM_CXEDGE);
-        case wxSYS_EDGE_Y:
-            return ::GetSystemMetrics(SM_CYEDGE);
+    SM_CXDRAG,
+    SM_CYDRAG,
+    SM_CXEDGE,
+    SM_CYEDGE,
+#else
+    -1, -1, -1, -1

 #endif
 #endif

-        case wxSYS_HSCROLL_ARROW_X:
-            return ::GetSystemMetrics(SM_CXHSCROLL);
-        case wxSYS_HSCROLL_ARROW_Y:
-            return ::GetSystemMetrics(SM_CYHSCROLL);
-        case wxSYS_HTHUMB_X:
-            return ::GetSystemMetrics(SM_CXHTHUMB);
-        case wxSYS_ICON_X:
-            return ::GetSystemMetrics(SM_CXICON);
-        case wxSYS_ICON_Y:
-            return ::GetSystemMetrics(SM_CYICON);
-        case wxSYS_ICONSPACING_X:
-            return ::GetSystemMetrics(SM_CXICONSPACING);
-        case wxSYS_ICONSPACING_Y:
-            return ::GetSystemMetrics(SM_CYICONSPACING);
-        case wxSYS_WINDOWMIN_X:
-            return ::GetSystemMetrics(SM_CXMIN);
-        case wxSYS_WINDOWMIN_Y:
-            return ::GetSystemMetrics(SM_CYMIN);
-        case wxSYS_SCREEN_X:
-            return ::GetSystemMetrics(SM_CXSCREEN);
-        case wxSYS_SCREEN_Y:
-            return ::GetSystemMetrics(SM_CYSCREEN);
+    SM_CXHSCROLL,
+    SM_CYHSCROLL,
+    SM_CXHTHUMB,
+    SM_CXICON,
+    SM_CYICON,
+    SM_CXICONSPACING,
+    SM_CYICONSPACING,
+    SM_CXMIN,
+    SM_CYMIN,
+    SM_CXSCREEN,
+    SM_CYSCREEN,

 
 #if defined(__WIN32__) && defined(SM_CXSIZEFRAME)
 
 #if defined(__WIN32__) && defined(SM_CXSIZEFRAME)

-        case wxSYS_FRAMESIZE_X:
-            return ::GetSystemMetrics(SM_CXSIZEFRAME);
-        case wxSYS_FRAMESIZE_Y:
-            return ::GetSystemMetrics(SM_CYSIZEFRAME);
-        case wxSYS_SMALLICON_X:
-            return ::GetSystemMetrics(SM_CXSMICON);
-        case wxSYS_SMALLICON_Y:
-            return ::GetSystemMetrics(SM_CYSMICON);
+    SM_CXSIZEFRAME,
+    SM_CYSIZEFRAME,
+    SM_CXSMICON,
+    SM_CYSMICON,
+#else
+    -1, -1, -1, -1

 #endif
 #endif

-        case wxSYS_HSCROLL_Y:
-            return ::GetSystemMetrics(SM_CYHSCROLL);
-        case wxSYS_VSCROLL_X:
-            return ::GetSystemMetrics(SM_CXVSCROLL);
-        case wxSYS_VSCROLL_ARROW_X:
-            return ::GetSystemMetrics(SM_CXVSCROLL);
-        case wxSYS_VSCROLL_ARROW_Y:
-            return ::GetSystemMetrics(SM_CYVSCROLL);
-        case wxSYS_VTHUMB_Y:
-            return ::GetSystemMetrics(SM_CYVTHUMB);
-        case wxSYS_CAPTION_Y:
-            return ::GetSystemMetrics(SM_CYCAPTION);
-        case wxSYS_MENU_Y:
-            return ::GetSystemMetrics(SM_CYMENU);
+    SM_CYHSCROLL,
+    SM_CXVSCROLL,
+    SM_CXVSCROLL,
+    SM_CYVSCROLL,
+    SM_CYVTHUMB,
+    SM_CYCAPTION,
+    SM_CYMENU,

 #if defined(__WIN32__) && defined(SM_NETWORK)
 #if defined(__WIN32__) && defined(SM_NETWORK)

-        case wxSYS_NETWORK_PRESENT:
-            return ::GetSystemMetrics(SM_NETWORK) & 0x0001;
+    SM_NETWORK,
+#else
+    -1,

 #endif
 #endif

-        case wxSYS_PENWINDOWS_PRESENT:
-            return ::GetSystemMetrics(SM_PENWINDOWS);
+    SM_PENWINDOWS,

 #if defined(__WIN32__) && defined(SM_SHOWSOUNDS)
 #if defined(__WIN32__) && defined(SM_SHOWSOUNDS)

-        case wxSYS_SHOW_SOUNDS:
-            return ::GetSystemMetrics(SM_SHOWSOUNDS);
+    SM_SHOWSOUNDS,
+#else
+    -1,

 #endif
 #endif

-        case wxSYS_SWAP_BUTTONS:
-            return ::GetSystemMetrics(SM_SWAPBUTTON);
-        default:
-            return 0;
+    SM_SWAPBUTTON,
+};
+
+// Get a system metric, e.g. scrollbar size
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+{
+#ifdef __WXMICROWIN__
+    // TODO: probably use wxUniv themes functionality
+    return 0;
+#else // !__WXMICROWIN__
+    wxCHECK_MSG( index < WXSIZEOF(gs_metricsMap), 0, _T("invalid metric") );
+
+    int indexMSW = gs_metricsMap[index];
+    if ( indexMSW == -1 )
+    {
+        // not supported under current system
+        return 0;

     }
     }

+
+    int rc = ::GetSystemMetrics(indexMSW);
+    if ( index == wxSYS_NETWORK_PRESENT )
+    {
+        // only the last bit is significant according to the MSDN
+        rc &= 1;
+    }
+
+    return rc;
+#endif // __WXMICROWIN__/!__WXMICROWIN__

 }
 
 }
 

+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
+{
+    switch ( index )
+    {
+        case wxSYS_CAN_ICONIZE_FRAME:
+        case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
+            return TRUE;
+
+        default:
+            wxFAIL_MSG( _T("unknown system feature") );
+
+            return FALSE;
+    }
+}