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

wxSystemSettings class API face lift: better names for its methods (wxMOTIF)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-01-01 17:28:50 +00:00
parent 563f868d38
commit a103111bae
3 changed files with 53 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/wx/motif/settings.h
View File

@@ -1,46 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: settings.h
// Purpose: wxSystemSettings class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_SETTINGS_H_
#define _WX_SETTINGS_H_
#ifdef __GNUG__
#pragma interface "settings.h"
#endif
#include "wx/setup.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/colour.h"
#include "wx/font.h"
class WXDLLEXPORT wxSystemSettings: public wxObject
{
public:
inline wxSystemSettings() {}
// Get a system colour
static wxColour GetSystemColour(int index);
// Get a system font
static wxFont GetSystemFont(int index);
// Get a system metric, e.g. scrollbar size
static int GetSystemMetric(int index);
// Return true if the port has certain feature
static bool GetCapability(int index);
};
#endif
// _WX_SETTINGS_H_

20
include/wx/settings.h
View File

@@ -165,22 +165,10 @@ public:
// include the declaration of the real platform-dependent class
// ----------------------------------------------------------------------------
#if defined(__WXMSW__)
#define wxHAS_SS_NATIVE
#elif defined(__WXMOTIF__)
#include "wx/motif/settings.h"
#elif defined(__WXGTK__)
#define wxHAS_SS_NATIVE
#elif defined(__WXMGL__)
#define wxHAS_SS_NATIVE
#elif defined(__WXMAC__)
#define wxHAS_SS_NATIVE
#elif defined(__WXPM__)
// TODO: this should go away once wxOS2 has been updated to use wxSSNative
#if defined(__WXPM__)
#include "wx/os2/settings.h"
#endif
// TODO: this should go away once all ports are updated to use wxSSNative
#ifdef wxHAS_SS_NATIVE
#else
class wxSystemSettings : public wxSystemSettingsNative
{
@@ -193,7 +181,7 @@ public:
#endif // __WXUNIVERSAL__
};
#endif // wxHAS_SS_NATIVE
#endif // ! __WXPM__
#endif
// _WX_SETTINGS_H_BASE_

12
src/motif/settings.cpp
View File

@@ -20,7 +20,7 @@
#include "wx/settings.h"
#include "wx/gdicmn.h"
wxColour wxSystemSettings::GetSystemColour(int index)
wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
{
switch (index)
{
@@ -70,6 +70,7 @@ wxColour wxSystemSettings::GetSystemColour(int index)
case wxSYS_COLOUR_WINDOWTEXT:
case wxSYS_COLOUR_CAPTIONTEXT:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT:
{
return *wxBLACK;
@@ -88,7 +89,7 @@ wxColour wxSystemSettings::GetSystemColour(int index)
return *wxWHITE;
}
wxFont wxSystemSettings::GetSystemFont(int index)
wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
{
switch (index)
{
@@ -111,7 +112,7 @@ wxFont wxSystemSettings::GetSystemFont(int index)
}
// Get a system metric, e.g. scrollbar size
int wxSystemSettings::GetSystemMetric(int index)
int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
{
switch ( index)
{
@@ -231,13 +232,14 @@ int wxSystemSettings::GetSystemMetric(int index)
}
}
bool wxSystemSettings::GetCapability(int index)
bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
{
switch (index)
{
case wxSYS_CAN_ICONIZE_FRAME:
case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
return TRUE; break;
return TRUE;
default:
return FALSE;
}