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

build fix; document HasFeature() (should be part of r59313)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-03-04 15:53:55 +00:00
parent 425ec0a5a3
commit d6e329cfbc
2 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/settings.h
View File

@@ -78,6 +78,8 @@ enum wxSystemColour
wxSYS_COLOUR_MENUBAR, wxSYS_COLOUR_MENUBAR,
wxSYS_COLOUR_LISTBOXTEXT, wxSYS_COLOUR_LISTBOXTEXT,
wxSYS_COLOUR_MAX,
// synonyms // synonyms
wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP, wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP,
wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE, wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,
@@ -85,9 +87,7 @@ enum wxSystemColour
wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT, wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE, wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE
wxSYS_COLOUR_MAX
}; };
// possible values for wxSystemSettings::GetMetric() index parameter // possible values for wxSystemSettings::GetMetric() index parameter

21
interface/wx/settings.h
View File

@@ -109,6 +109,10 @@ enum wxSystemColour
*/ */
wxSYS_COLOUR_LISTBOXTEXT, wxSYS_COLOUR_LISTBOXTEXT,
wxSYS_COLOUR_MAX
// synonyms: // synonyms:
wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP, wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP,
@@ -129,13 +133,12 @@ enum wxSystemColour
On wxMSW this colour should be used as the background colour of On wxMSW this colour should be used as the background colour of
wxFrames which are used as containers of controls; this is in fact the wxFrames which are used as containers of controls; this is in fact the
same colour used for the borders of controls like e.g. wxNotebook. same colour used for the borders of controls like e.g. wxNotebook or
for the background of e.g. wxPanel.
@since 2.9.0 @since 2.9.0
*/ */
wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE, wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE
wxSYS_COLOUR_MAX
}; };
/** /**
@@ -197,7 +200,7 @@ enum wxSystemFeature
}; };
/** /**
Values for different screen designs. Values for different screen designs. See wxSystemSettings::GetScreenType().
*/ */
enum wxSystemScreenType enum wxSystemScreenType
{ {
@@ -220,7 +223,7 @@ enum wxSystemScreenType
@library{wxcore} @library{wxcore}
@category{cfg} @category{cfg}
@see wxFont, wxColour @see wxFont, wxColour, wxSystemOptions
*/ */
class wxSystemSettings : public wxObject class wxSystemSettings : public wxObject
{ {
@@ -271,5 +274,11 @@ public:
The return value is one of the ::wxSystemScreenType enum values. The return value is one of the ::wxSystemScreenType enum values.
*/ */
static wxSystemScreenType GetScreenType(); static wxSystemScreenType GetScreenType();
/**
Returns @true if the port has certain feature.
See the ::wxSystemFeature enum values.
*/
static bool HasFeature(wxSystemFeature index);
}; };