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

Merge branch 'staging' of https://github.com/stahta01/wxWidgets_PR

Browse Source 
Better documentation for __WXGTKXXX__ constants.

Closes https://github.com/wxWidgets/wxWidgets/pull/825
This commit is contained in:
Vadim Zeitlin
2018-06-01 18:20:27 +02:00
parent dcac98d7e8 f295dfdd0c
commit 356c93dc3c
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/doxygen/mainpages/const_cpp.h
View File

@@ -26,10 +26,11 @@ using @ifdef_ and not @if_.
@itemdef{__WXBASE__, Only wxBase, no GUI features (same as @c wxUSE_GUI == 0)}
@itemdef{__WXDFB__, wxUniversal using DirectFB}
@itemdef{__WXGTK__, GTK+}
@itemdef{__WXGTK12__, GTK+ 1.2 or higher}
@itemdef{__WXGTK20__, GTK+ 2.0 or higher}
@itemdef{__WXGTK24__, GTK+ 2.4 or higher}
@itemdef{__WXGTK127__, GTK+ 1.2.7 or higher}
@itemdef{__WXGTK20__, GTK+ 2.0 (2.6) or higher}
@itemdef{__WXGTK210__, GTK+ 2.10 or higher}
@itemdef{__WXGTK218__, GTK+ 2.18 or higher}
@itemdef{__WXGTK220__, GTK+ 2.20 or higher}
@itemdef{__WXMAC__, old define, same as <tt>__WXOSX__</tt>}
@itemdef{__WXMOTIF__, Motif}
@itemdef{__WXMOTIF20__, Motif 2.0 or higher}

2
samples/widgets/clrpicker.cpp
View File

@@ -119,7 +119,7 @@ wxEND_EVENT_TABLE()
// implementation
// ============================================================================
#if defined(__WXGTK24__)
#if defined(__WXGTK20__)
#define FAMILY_CTRLS NATIVE_CTRLS
#else
#define FAMILY_CTRLS GENERIC_CTRLS

2
samples/widgets/dirpicker.cpp
View File

@@ -127,7 +127,7 @@ wxEND_EVENT_TABLE()
// implementation
// ============================================================================
#if defined(__WXGTK24__)
#if defined(__WXGTK20__)
#define FAMILY_CTRLS NATIVE_CTRLS
#else
#define FAMILY_CTRLS GENERIC_CTRLS

2
samples/widgets/filepicker.cpp
View File

@@ -144,7 +144,7 @@ wxEND_EVENT_TABLE()
// implementation
// ============================================================================
#if defined(__WXGTK24__)
#if defined(__WXGTK20__)
#define FAMILY_CTRLS NATIVE_CTRLS
#else
#define FAMILY_CTRLS GENERIC_CTRLS

2
samples/widgets/fontpicker.cpp
View File

@@ -119,7 +119,7 @@ wxEND_EVENT_TABLE()
// implementation
// ============================================================================
#if defined(__WXGTK24__)
#if defined(__WXGTK20__)
#define FAMILY_CTRLS NATIVE_CTRLS
#else
#define FAMILY_CTRLS GENERIC_CTRLS