/////////////////////////////////////////////////////////////////////////////
-// Name: msw/settings.cpp
+// Name: src/msw/settings.cpp
// Purpose: wxSystemSettingsNative implementation for MSW
// Author: Julian Smart
// Modified by:
#pragma hdrstop
#endif
+#include "wx/settings.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/gdicmn.h"
+ #include "wx/module.h"
#endif
-#include "wx/settings.h"
-
#include "wx/msw/private.h"
+#include "wx/msw/missing.h" // for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC
#ifndef SPI_GETFLATMENU
#define SPI_GETFLATMENU 0x1022
#endif
-#include "wx/module.h"
#include "wx/fontutil.h"
-
-#ifdef __WXWINCE__ // for SM_CXCURSOR and SM_CYCURSOR
-#include "wx/msw/wince/missing.h"
-#endif // __WXWINCE__
+#include "wx/fontenum.h"
// ----------------------------------------------------------------------------
// private classes
bool wxSystemSettingsModule::OnInit()
{
- return TRUE;
+ return true;
}
void wxSystemSettingsModule::OnExit()
// is no invalid colour value we use hasCol as the real indicator of
// whether colSys was initialized or not
COLORREF colSys = 0;
- bool hasCol = FALSE;
+ bool hasCol = false;
// the default colours for the entries after BTNHIGHLIGHT
static const COLORREF s_defaultSysColors[] =
0, // MENUBAR (unused)
};
- if ( index == wxSYS_COLOUR_LISTBOX )
+ if ( index == wxSYS_COLOUR_LISTBOXTEXT)
+ {
+ // there is no standard colour with this index, map to another one
+ index = wxSYS_COLOUR_WINDOWTEXT;
+ }
+ else if ( index == wxSYS_COLOUR_LISTBOX )
{
// there is no standard colour with this index, map to another one
index = wxSYS_COLOUR_WINDOW;
if ( verMaj < 4 )
{
// NT 3.5
- useDefault = TRUE;
+ useDefault = true;
}
else if ( verMaj == 4 )
{
else // >= 5.1
{
// 5.1 is Windows XP
- useDefault = FALSE;
- // Determine if we are using flat menus, only then allow wxSYS_COLOUR_MENUBAR
- if ( index == wxSYS_COLOUR_MENUBAR )
- {
- BOOL isFlat ;
- if ( SystemParametersInfo( SPI_GETFLATMENU , 0 ,&isFlat, 0 ) )
- {
- if ( !isFlat )
- index = wxSYS_COLOUR_MENU ;
- }
- }
- }
+ useDefault = false;
+ // Determine if we are using flat menus, only then allow wxSYS_COLOUR_MENUBAR
+ if ( index == wxSYS_COLOUR_MENUBAR )
+ {
+ BOOL isFlat ;
+ if ( SystemParametersInfo( SPI_GETFLATMENU , 0 ,&isFlat, 0 ) )
+ {
+ if ( !isFlat )
+ index = wxSYS_COLOUR_MENU ;
+ }
+ }
+ }
if ( useDefault )
{
unsigned int n = index - wxSYS_COLOUR_BTNHIGHLIGHT;
wxASSERT_MSG( n < WXSIZEOF(s_defaultSysColors),
- _T("forgot tp update the default colours array") );
+ wxT("forgot tp update the default colours array") );
colSys = s_defaultSysColors[n];
- hasCol = TRUE;
+ hasCol = true;
}
}
}
colSys = ::GetSysColor(index);
#endif
}
-
- return wxRGBToColour(colSys);
+
+ wxColour ret = wxRGBToColour(colSys);
+ wxASSERT(ret.IsOk());
+ return ret;
}
// ----------------------------------------------------------------------------
{
wxNativeFontInfo info;
info.lf = lf;
+#ifndef __WXWINCE__
+ // We want Windows 2000 or later to have new fonts even MS Shell Dlg
+ // is returned as default GUI font for compatibility
+ int verMaj;
+ if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
+ wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
+#endif
// 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.
}
else
{
- wxFAIL_MSG( _T("failed to get LOGFONT") );
+ wxFAIL_MSG( wxT("failed to get LOGFONT") );
}
}
else // GetStockObject() failed
{
- wxFAIL_MSG( _T("stock font not found") );
+ wxFAIL_MSG( wxT("stock font not found") );
}
return font;
wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
{
- // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
+#ifdef __WXWINCE__
+ // under CE only a single SYSTEM_FONT exists
+ index;
+
+ if ( !gs_fontDefault )
+ {
+ gs_fontDefault = new wxFont(wxCreateFontFromStockObject(SYSTEM_FONT));
+ }
+
+ wxASSERT(gs_fontDefault->IsOk() &&
+ wxFontEnumerator::IsValidFacename(gs_fontDefault->GetFaceName()));
+ return *gs_fontDefault;
+#else // !__WXWINCE__
+ // wxWindow ctor calls GetFont(wxSYS_DEFAULT_GUI_FONT) so we're
// called fairly often -- this is why we cache this particular font
const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
if ( isDefaultRequested )
gs_fontDefault = new wxFont(font);
}
+ wxASSERT(font.IsOk());
+
+#if wxUSE_FONTENUM
+ wxASSERT(wxFontEnumerator::IsValidFacename(font.GetFaceName()));
+#endif // wxUSE_FONTENUM
+
return font;
+#endif // __WXWINCE__/!__WXWINCE__
}
// ----------------------------------------------------------------------------
SM_CXBORDER,
SM_CYBORDER,
+#ifdef SM_CXCURSOR
SM_CXCURSOR,
SM_CYCURSOR,
+#else
+ -1, -1,
+#endif
SM_CXDOUBLECLK,
SM_CYDOUBLECLK,
#if defined(__WIN32__) && defined(SM_CXDRAG)
-1, -1, -1, -1,
#endif
SM_CYHSCROLL,
- SM_CXVSCROLL,
+ SM_CXHSCROLL,
SM_CXVSCROLL,
SM_CYVSCROLL,
#ifdef SM_CYVTHUMB
#else
-1,
#endif
+ // SM_SWAPBUTTON is not available under CE and it doesn't make sense to ask
+ // for it there
#ifdef SM_SWAPBUTTON
SM_SWAPBUTTON,
#else
- -1
+ -1,
#endif
+ -1 // wxSYS_DCLICK_MSEC - not available as system metric
};
// Get a system metric, e.g. scrollbar size
-int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
{
#ifdef __WXMICROWIN__
// TODO: probably use wxUniv themes functionality
return 0;
#else // !__WXMICROWIN__
wxCHECK_MSG( index > 0 && (size_t)index < WXSIZEOF(gs_metricsMap), 0,
- _T("invalid metric") );
+ wxT("invalid metric") );
+
+ if ( index == wxSYS_DCLICK_MSEC )
+ {
+ // This one is not a Win32 system metric
+ return ::GetDoubleClickTime();
+ }
int indexMSW = gs_metricsMap[index];
if ( indexMSW == -1 )
{
// not supported under current system
- return 0;
+ return -1;
}
int rc = ::GetSystemMetrics(indexMSW);
{
case wxSYS_CAN_ICONIZE_FRAME:
case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
- return TRUE;
+ return true;
+
+ case wxSYS_TABLET_PRESENT:
+ return ::GetSystemMetrics(SM_TABLETPC) != 0;
default:
- wxFAIL_MSG( _T("unknown system feature") );
+ wxFAIL_MSG( wxT("unknown system feature") );
- return FALSE;
+ return false;
}
}
int verMaj, verMin;
switch ( wxGetOsVersion(&verMaj, &verMin) )
{
- case wxWIN95:
+ case wxOS_WINDOWS_9X:
// 4.10 is Win98
- useIconFont = verMin == 4 && verMin >= 10;
+ useIconFont = verMaj == 4 && verMin >= 10;
break;
- case wxWINDOWS_NT:
+ case wxOS_WINDOWS_NT:
// 5.0 is Win2k
useIconFont = verMaj >= 5;
break;
}
else
{
- wxLogLastError(_T("SystemParametersInfo(SPI_GETICONTITLELOGFONT"));
+ wxLogLastError(wxT("SystemParametersInfo(SPI_GETICONTITLELOGFONT"));
}
}
#endif // __WXWINCE__
projects / wxWidgets.git / blobdiff