Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. wxSystemSettings class API face lift: better names for its methods

Browse Source 
2. wxSystemSettings under wxUniv uses the wxTheme and wxColourScheme


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-30 22:34:36 +00:00
parent a1622950a6
commit 7516ed26c9
9 changed files with 217 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/wx/settings.h
View File

@@ -1,12 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/settings.h
// Purpose: wxSystemSettingsBase class
// Purpose: wxSystemSettings class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_SETTINGS_H_BASE_
@@ -73,6 +73,9 @@ enum wxSystemColour
};
// possible values for wxSystemSettings::GetMetric() parameter
//
// NB: update the conversion table in msw/settings.cpp if you change the values
// of the elements of this enum
enum wxSystemMetric
{
wxSYS_MOUSE_BUTTONS = 1,
@@ -122,7 +125,7 @@ enum wxSystemFeature
};
// ----------------------------------------------------------------------------
// wxSystemSettingsBase: defines the API for wxSystemSettings class
// wxSystemSettingsNative: defines the API for wxSystemSettings class
// ----------------------------------------------------------------------------
// this is a namespace rather than a class: it has only non virtual static
@@ -132,8 +135,7 @@ enum wxSystemFeature
// files (i.e. this is not a real base class as we can't override its virtual
// functions because it doesn't have any)
#if 0
class WXDLLEXPORT wxSystemSettingsBase
class WXDLLEXPORT wxSystemSettingsNative
{
public:
// get a standard system colour
@@ -157,17 +159,14 @@ public:
{ return GetFont((wxSystemFont)index); }
static int GetSystemMetric(int index)
{ return GetMetric((wxSystemMetric)index); }
static bool GetCapability(int index)
{ return HasFeature((wxSystemFeature)index); }
};
#endif
// ----------------------------------------------------------------------------
// include the declaration of the real platform-dependent class
// ----------------------------------------------------------------------------
#if defined(__WXMSW__)
#include "wx/msw/settings.h"
#define wxHAS_SS_NATIVE
#elif defined(__WXMOTIF__)
#include "wx/motif/settings.h"
#elif defined(__WXGTK__)
@@ -180,6 +179,22 @@ public:
#include "wx/os2/settings.h"
#endif
// TODO: this should go away once all ports are updated to use wxSSNative
#ifdef wxHAS_SS_NATIVE
class wxSystemSettings : public wxSystemSettingsNative
{
public:
#ifdef __WXUNIVERSAL__
// in wxUniversal we want to use the theme standard colours instead of the
// system ones, otherwuse wxSystemSettings is just the same as
// wxSystemSettingsNative
static wxColour GetColour(wxSystemColour index);
#endif // __WXUNIVERSAL__
};
#endif // wxHAS_SS_NATIVE
#endif
// _WX_SETTINGS_H_BASE_