From: Gilles Depeyrot Date: Mon, 31 Dec 2001 21:09:47 +0000 (+0000) Subject: wxSystemSettings class API face lift: better names for its methods X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a174f139e105c38ae852104eb6a894b3a0d88e07 wxSystemSettings class API face lift: better names for its methods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mac/settings.h b/include/wx/mac/settings.h deleted file mode 100644 index 90aa26f794..0000000000 --- a/include/wx/mac/settings.h +++ /dev/null @@ -1,137 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: settings.h -// Purpose: wxSystemSettings class -// Author: AUTHOR -// Modified by: -// Created: ??/??/98 -// RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// 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" - -#define wxSYS_WHITE_BRUSH 0 -#define wxSYS_LTGRAY_BRUSH 1 -#define wxSYS_GRAY_BRUSH 2 -#define wxSYS_DKGRAY_BRUSH 3 -#define wxSYS_BLACK_BRUSH 4 -#define wxSYS_NULL_BRUSH 5 -#define wxSYS_HOLLOW_BRUSH wxSYS_NULL_BRUSH -#define wxSYS_WHITE_PEN 6 -#define wxSYS_BLACK_PEN 7 -#define wxSYS_NULL_PEN 8 -#define wxSYS_OEM_FIXED_FONT 10 -#define wxSYS_ANSI_FIXED_FONT 11 -#define wxSYS_ANSI_VAR_FONT 12 -#define wxSYS_SYSTEM_FONT 13 -#define wxSYS_DEVICE_DEFAULT_FONT 14 -#define wxSYS_DEFAULT_PALETTE 15 -#define wxSYS_SYSTEM_FIXED_FONT 16 // Obsolete -#define wxSYS_DEFAULT_GUI_FONT 17 - -#define wxSYS_COLOUR_SCROLLBAR 0 -#define wxSYS_COLOUR_BACKGROUND 1 -#define wxSYS_COLOUR_ACTIVECAPTION 2 -#define wxSYS_COLOUR_INACTIVECAPTION 3 -#define wxSYS_COLOUR_MENU 4 -#define wxSYS_COLOUR_WINDOW 5 -#define wxSYS_COLOUR_WINDOWFRAME 6 -#define wxSYS_COLOUR_MENUTEXT 7 -#define wxSYS_COLOUR_WINDOWTEXT 8 -#define wxSYS_COLOUR_CAPTIONTEXT 9 -#define wxSYS_COLOUR_ACTIVEBORDER 10 -#define wxSYS_COLOUR_INACTIVEBORDER 11 -#define wxSYS_COLOUR_APPWORKSPACE 12 -#define wxSYS_COLOUR_HIGHLIGHT 13 -#define wxSYS_COLOUR_HIGHLIGHTTEXT 14 -#define wxSYS_COLOUR_BTNFACE 15 -#define wxSYS_COLOUR_BTNSHADOW 16 -#define wxSYS_COLOUR_GRAYTEXT 17 -#define wxSYS_COLOUR_BTNTEXT 18 -#define wxSYS_COLOUR_INACTIVECAPTIONTEXT 19 -#define wxSYS_COLOUR_BTNHIGHLIGHT 20 - -#define wxSYS_COLOUR_3DDKSHADOW 21 -#define wxSYS_COLOUR_3DLIGHT 22 -#define wxSYS_COLOUR_INFOTEXT 23 -#define wxSYS_COLOUR_INFOBK 24 - -#define wxSYS_COLOUR_DESKTOP wxSYS_COLOUR_BACKGROUND -#define wxSYS_COLOUR_3DFACE wxSYS_COLOUR_BTNFACE -#define wxSYS_COLOUR_3DSHADOW wxSYS_COLOUR_BTNSHADOW -#define wxSYS_COLOUR_3DHIGHLIGHT wxSYS_COLOUR_BTNHIGHLIGHT -#define wxSYS_COLOUR_3DHILIGHT wxSYS_COLOUR_BTNHIGHLIGHT -#define wxSYS_COLOUR_BTNHILIGHT wxSYS_COLOUR_BTNHIGHLIGHT - -// Metrics -#define wxSYS_MOUSE_BUTTONS 1 -#define wxSYS_BORDER_X 2 -#define wxSYS_BORDER_Y 3 -#define wxSYS_CURSOR_X 4 -#define wxSYS_CURSOR_Y 5 -#define wxSYS_DCLICK_X 6 -#define wxSYS_DCLICK_Y 7 -#define wxSYS_DRAG_X 8 -#define wxSYS_DRAG_Y 9 -#define wxSYS_EDGE_X 10 -#define wxSYS_EDGE_Y 11 -#define wxSYS_HSCROLL_ARROW_X 12 -#define wxSYS_HSCROLL_ARROW_Y 13 -#define wxSYS_HTHUMB_X 14 -#define wxSYS_ICON_X 15 -#define wxSYS_ICON_Y 16 -#define wxSYS_ICONSPACING_X 17 -#define wxSYS_ICONSPACING_Y 18 -#define wxSYS_WINDOWMIN_X 19 -#define wxSYS_WINDOWMIN_Y 20 -#define wxSYS_SCREEN_X 21 -#define wxSYS_SCREEN_Y 22 -#define wxSYS_FRAMESIZE_X 23 -#define wxSYS_FRAMESIZE_Y 24 -#define wxSYS_SMALLICON_X 25 -#define wxSYS_SMALLICON_Y 26 -#define wxSYS_HSCROLL_Y 27 -#define wxSYS_VSCROLL_X 28 -#define wxSYS_VSCROLL_ARROW_X 29 -#define wxSYS_VSCROLL_ARROW_Y 30 -#define wxSYS_VTHUMB_Y 31 -#define wxSYS_CAPTION_Y 32 -#define wxSYS_MENU_Y 33 -#define wxSYS_NETWORK_PRESENT 34 -#define wxSYS_PENWINDOWS_PRESENT 35 -#define wxSYS_SHOW_SOUNDS 36 -#define wxSYS_SWAP_BUTTONS 37 - -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_ diff --git a/include/wx/settings.h b/include/wx/settings.h index 2b4263af23..7c4b902885 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -174,7 +174,7 @@ public: #elif defined(__WXMGL__) #define wxHAS_SS_NATIVE #elif defined(__WXMAC__) - #include "wx/mac/settings.h" + #define wxHAS_SS_NATIVE #elif defined(__WXPM__) #include "wx/os2/settings.h" #endif diff --git a/src/mac/carbon/settings.cpp b/src/mac/carbon/settings.cpp index b272f5f5dd..92d586c90c 100644 --- a/src/mac/carbon/settings.cpp +++ b/src/mac/carbon/settings.cpp @@ -17,7 +17,15 @@ #include "wx/gdicmn.h" #include "wx/utils.h" -wxColour wxSystemSettings::GetSystemColour(int index) +// ---------------------------------------------------------------------------- +// wxSystemSettingsNative +// ---------------------------------------------------------------------------- + +// ---------------------------------------------------------------------------- +// colours +// ---------------------------------------------------------------------------- + +wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) { int major,minor; wxGetOsVersion( &major, &minor ); @@ -93,7 +101,11 @@ wxColour wxSystemSettings::GetSystemColour(int index) return *wxWHITE; } -wxFont wxSystemSettings::GetSystemFont(int index) +// ---------------------------------------------------------------------------- +// fonts +// ---------------------------------------------------------------------------- + +wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) { switch (index) { @@ -118,8 +130,12 @@ wxFont wxSystemSettings::GetSystemFont(int index) return *wxNORMAL_FONT; } +// ---------------------------------------------------------------------------- +// system metrics/features +// ---------------------------------------------------------------------------- + // Get a system metric, e.g. scrollbar size -int wxSystemSettings::GetSystemMetric(int index) +int wxSystemSettingsNative::GetMetric(wxSystemMetric index) { switch ( index) { @@ -156,11 +172,11 @@ int wxSystemSettings::GetSystemMetric(int index) // TODO return 0; case wxSYS_HSCROLL_ARROW_X: - return 16; + return 16; case wxSYS_HSCROLL_ARROW_Y: - return 16; + return 16; case wxSYS_HTHUMB_X: - return 16; + return 16; case wxSYS_ICON_X: // TODO return 0; @@ -198,44 +214,45 @@ int wxSystemSettings::GetSystemMetric(int index) // TODO return 0; case wxSYS_HSCROLL_Y: - return 16; + return 16; case wxSYS_VSCROLL_X: - return 16; + return 16; case wxSYS_VSCROLL_ARROW_X: - return 16; + return 16; case wxSYS_VSCROLL_ARROW_Y: - return 16; + return 16; case wxSYS_VTHUMB_Y: - return 16; + return 16; case wxSYS_CAPTION_Y: // TODO - return 0; + return 0; case wxSYS_MENU_Y: // TODO - return 0; + return 0; case wxSYS_NETWORK_PRESENT: // TODO - return 0; + return 0; case wxSYS_PENWINDOWS_PRESENT: - return 0; + return 0; case wxSYS_SHOW_SOUNDS: // TODO return 0; case wxSYS_SWAP_BUTTONS: - return 0; - default: - return 0; + return 0; + default: + return 0; } return 0; } -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; } diff --git a/src/mac/settings.cpp b/src/mac/settings.cpp index b272f5f5dd..92d586c90c 100644 --- a/src/mac/settings.cpp +++ b/src/mac/settings.cpp @@ -17,7 +17,15 @@ #include "wx/gdicmn.h" #include "wx/utils.h" -wxColour wxSystemSettings::GetSystemColour(int index) +// ---------------------------------------------------------------------------- +// wxSystemSettingsNative +// ---------------------------------------------------------------------------- + +// ---------------------------------------------------------------------------- +// colours +// ---------------------------------------------------------------------------- + +wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) { int major,minor; wxGetOsVersion( &major, &minor ); @@ -93,7 +101,11 @@ wxColour wxSystemSettings::GetSystemColour(int index) return *wxWHITE; } -wxFont wxSystemSettings::GetSystemFont(int index) +// ---------------------------------------------------------------------------- +// fonts +// ---------------------------------------------------------------------------- + +wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) { switch (index) { @@ -118,8 +130,12 @@ wxFont wxSystemSettings::GetSystemFont(int index) return *wxNORMAL_FONT; } +// ---------------------------------------------------------------------------- +// system metrics/features +// ---------------------------------------------------------------------------- + // Get a system metric, e.g. scrollbar size -int wxSystemSettings::GetSystemMetric(int index) +int wxSystemSettingsNative::GetMetric(wxSystemMetric index) { switch ( index) { @@ -156,11 +172,11 @@ int wxSystemSettings::GetSystemMetric(int index) // TODO return 0; case wxSYS_HSCROLL_ARROW_X: - return 16; + return 16; case wxSYS_HSCROLL_ARROW_Y: - return 16; + return 16; case wxSYS_HTHUMB_X: - return 16; + return 16; case wxSYS_ICON_X: // TODO return 0; @@ -198,44 +214,45 @@ int wxSystemSettings::GetSystemMetric(int index) // TODO return 0; case wxSYS_HSCROLL_Y: - return 16; + return 16; case wxSYS_VSCROLL_X: - return 16; + return 16; case wxSYS_VSCROLL_ARROW_X: - return 16; + return 16; case wxSYS_VSCROLL_ARROW_Y: - return 16; + return 16; case wxSYS_VTHUMB_Y: - return 16; + return 16; case wxSYS_CAPTION_Y: // TODO - return 0; + return 0; case wxSYS_MENU_Y: // TODO - return 0; + return 0; case wxSYS_NETWORK_PRESENT: // TODO - return 0; + return 0; case wxSYS_PENWINDOWS_PRESENT: - return 0; + return 0; case wxSYS_SHOW_SOUNDS: // TODO return 0; case wxSYS_SWAP_BUTTONS: - return 0; - default: - return 0; + return 0; + default: + return 0; } return 0; } -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; }