AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trying to get wxUSE_NATIVE_STATUSBAR setting correctly: define it to 1 by default but reset it to 0 in wx/chkconf.h if it's not supported

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-01-20 01:01:55 +00:00
parent b5c4505960
commit da4486fb82
5 changed files with 316 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

875
configure vendored
View File

File diff suppressed because it is too large Load Diff

2
configure.in
View File

@ -5622,6 +5622,8 @@ if test "$wxUSE_STATLINE" = "yes"; then
fi
if test "$wxUSE_STATUSBAR" = "yes"; then
dnl this will get undefined in wx/chkconf.h if it's not supported
AC_DEFINE(wxUSE_NATIVE_STATUSBAR)
AC_DEFINE(wxUSE_STATUSBAR)
USES_CONTROLS=1

10
include/wx/chkconf.h
View File

@ -1011,6 +1011,16 @@
# endif
#endif /* wxUSE_CHOICEBOOK */
/* don't attempt to use native status bar on the platforms not having it */
#ifndef wxUSE_NATIVE_STATUSBAR
# define wxUSE_NATIVE_STATUSBAR 0
#elif wxUSE_NATIVE_STATUSBAR
# if defined(__WXUNIVERSAL__) || !(defined(__WXMSW__) || !defined(__WXMAC__))
# undef wxUSE_NATIVE_STATUSBAR
# define wxUSE_NATIVE_STATUSBAR 0
# endif
#endif
/* wxUniv-specific dependencies */
#if defined(__WXUNIVERSAL__)
# if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN

4
include/wx/setup_inc.h
View File

@ -559,11 +559,7 @@
// Default is 1 for the platforms where native status bar is supported.
//
// Recommended setting: 1 (there is no advantage in using the generic one)
#if defined(__WXMSW__) || defined(__WXMAC__)
#define wxUSE_NATIVE_STATUSBAR 1
#else
#define wxUSE_NATIVE_STATUSBAR 0
#endif
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless

5
setup.h.in
View File

@ -495,11 +495,6 @@
#define wxUSE_OWNER_DRAWN 1
#endif
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
#undef wxUSE_NATIVE_STATUSBAR
#define wxUSE_NATIVE_STATUSBAR 1
#endif
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1
#else