projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use native conversions that are close to the native storage of wxString
[wxWidgets.git]
/
src
/
mgl
/
settings.cpp
diff --git
a/src/mgl/settings.cpp
b/src/mgl/settings.cpp
index 24132c37275e972b28e2ec1aba2e8d42681a3243..9b2d8621b4fe464776941be42980d6fec9568c58 100644
(file)
--- a/
src/mgl/settings.cpp
+++ b/
src/mgl/settings.cpp
@@
-1,16
+1,11
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: s
ettings.h
+// Name: s
rc/mgl/settings.cpp
// Author: Vaclav Slavik, Robert Roebling
// Id: $Id$
// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
// Author: Vaclav Slavik, Robert Roebling
// Id: $Id$
// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "settings.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-19,10
+14,13
@@
#endif
#include "wx/settings.h"
#endif
#include "wx/settings.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/gdicmn.h"
-#include "wx/module.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+ #include "wx/font.h"
+ #include "wx/gdicmn.h"
+ #include "wx/module.h"
+#endif
// ----------------------------------------------------------------------------
// global data
// ----------------------------------------------------------------------------
// global data
@@
-33,7
+31,7
@@
static wxFont *gs_fontDefault = NULL;
class wxSystemSettingsModule : public wxModule
{
public:
class wxSystemSettingsModule : public wxModule
{
public:
- virtual bool OnInit() { return
TRUE
; }
+ virtual bool OnInit() { return
true
; }
virtual void OnExit()
{
delete gs_fontDefault;
virtual void OnExit()
{
delete gs_fontDefault;
@@
-50,7
+48,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
{
wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
{
- //
not implemented, the mean is
in wxUniversal
+ //
overridden by wxSystemSettings::GetColour
in wxUniversal
return wxColour(0,0,0);
}
return wxColour(0,0,0);
}
@@
-70,18
+68,21
@@
wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
case wxSYS_DEFAULT_GUI_FONT:
{
if ( !gs_fontDefault )
case wxSYS_DEFAULT_GUI_FONT:
{
if ( !gs_fontDefault )
- gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL,
FALSE
, "Arial");
+ gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL,
false
, "Arial");
return *gs_fontDefault;
}
default:
return *gs_fontDefault;
}
default:
- return wxNullFont;
+ {
+ }
}
}
+
+ return wxNullFont;
}
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
{
int val;
}
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))
{
int val;
-
+
switch (index)
{
case wxSYS_SCREEN_X:
switch (index)
{
case wxSYS_SCREEN_X:
@@
-90,24
+91,26
@@
int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
case wxSYS_SCREEN_Y:
wxDisplaySize(NULL, &val);
return val;
case wxSYS_SCREEN_Y:
wxDisplaySize(NULL, &val);
return val;
- case wxSYS_VSCROLL_X:
- case wxSYS_HSCROLL_Y:
- return 15;
- break;
default:
default:
- return -1; // unsupported metric
+ {
+ }
}
}
+
+ return -1; // unsupported metric
}
bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
{
switch (index)
{
}
bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
{
switch (index)
{
- case wxSYS_CAN_ICONIZE_FRAME:
- return FALSE; break;
+ case wxSYS_CAN_ICONIZE_FRAME:
case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
- return FALSE; break;
+ case wxSYS_TABLET_PRESENT:
+ return false;
+
default:
default:
-
return FALSE
;
+
wxFAIL_MSG( _T("unknown feature") )
;
}
}
+
+ return false;
}
}