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

removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2006-08-23 09:54:29 +00:00
parent 59b7a28003
commit 27cc91429d
6 changed files with 13 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
configure vendored
View File

@ -1075,7 +1075,6 @@ Optional Features:
--enable-togglebtn use wxToggleButton class
--enable-toolbar use wxToolBar class
--enable-tbarnative use native wxToolBar class
--enable-tbarsmpl use wxToolBarSimple class
--enable-treebook use wxTreebook class
--enable-toolbook use wxToolbook class
--enable-treectrl use wxTreeCtrl class
@ -2330,7 +2329,6 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TREEBOOK=no
DEFAULT_wxUSE_TOOLBOOK=no
DEFAULT_wxUSE_TREECTRL=no
@ -2543,7 +2541,6 @@ else
DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TREEBOOK=yes
DEFAULT_wxUSE_TOOLBOOK=yes
DEFAULT_wxUSE_TREECTRL=yes
@ -7728,7 +7725,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then
DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TOOLTIPS=yes
DEFAULT_wxUSE_TREEBOOK=yes
DEFAULT_wxUSE_TOOLBOOK=yes
@ -7778,7 +7774,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREEBOOK=no
DEFAULT_wxUSE_TOOLBOOK=no
@ -9633,47 +9628,6 @@ echo "${ECHO_T}no" >&6
fi
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarsmpl" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-tbarsmpl... $ECHO_C" >&6
no_cache=0
# Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
if test "${enable_tbarsmpl+set}" = set; then
enableval="$enable_tbarsmpl"
if test "$enableval" = yes; then
ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
else
ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
fi
else
LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
fi;
eval "$ac_cv_use_tbarsmpl"
if test "$no_cache" != 1; then
echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
fi
if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6
@ -12181,7 +12135,7 @@ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
CFLAGS="$CFLAGS -g"
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
@ -12653,7 +12607,7 @@ fi
unset ac_cv_prog_cc_g
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
CFLAGS="$CFLAGS -g"
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
@ -13825,9 +13779,9 @@ if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
if test "$GXX" = yes; then
CXXFLAGS="-g -O2"
CXXFLAGS="$CXXFLAGS -g -O2"
else
CXXFLAGS="-g"
CXXFLAGS="$CXXFLAGS -g"
fi
else
if test "$GXX" = yes; then
@ -14090,7 +14044,7 @@ fi
unset ac_cv_prog_cc_g
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
CFLAGS="$CFLAGS -g"
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
@ -34613,10 +34567,8 @@ if test "${wx_cv_func_snprintf_pos_params+set}" = set; then
else
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
{ { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
@ -44854,15 +44806,6 @@ _ACEOF
fi
fi
if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_TOOLBAR_SIMPLE 1
_ACEOF
wxUSE_TOOLBAR="yes"
USES_CONTROLS=1
fi
if test "$wxUSE_TOOLBAR" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_TOOLBAR 1
@ -44870,16 +44813,12 @@ _ACEOF
USES_CONTROLS=1
if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
wxUSE_TOOLBAR_NATIVE="yes"
fi
wxUSE_TOOLBAR_NATIVE="yes"
if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_TOOLBAR_NATIVE 1
_ACEOF
USES_CONTROLS=1
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"

18
configure.in
View File

@ -550,7 +550,6 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TREEBOOK=no
DEFAULT_wxUSE_TOOLBOOK=no
DEFAULT_wxUSE_TREECTRL=no
@ -763,7 +762,6 @@ else
DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TREEBOOK=yes
DEFAULT_wxUSE_TOOLBOOK=yes
DEFAULT_wxUSE_TREECTRL=yes
@ -1080,7 +1078,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then
DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TOOLTIPS=yes
DEFAULT_wxUSE_TREEBOOK=yes
DEFAULT_wxUSE_TOOLBOOK=yes
@ -1130,7 +1127,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREEBOOK=no
DEFAULT_wxUSE_TOOLBOOK=no
@ -1184,7 +1180,6 @@ WX_ARG_ENABLE(textctrl, [ --enable-textctrl use wxTextCtrl class], wxU
WX_ARG_ENABLE(togglebtn, [ --enable-togglebtn use wxToggleButton class], wxUSE_TOGGLEBTN)
WX_ARG_ENABLE(toolbar, [ --enable-toolbar use wxToolBar class], wxUSE_TOOLBAR)
WX_ARG_ENABLE(tbarnative, [ --enable-tbarnative use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
WX_ARG_ENABLE(tbarsmpl, [ --enable-tbarsmpl use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
WX_ARG_ENABLE(treebook, [ --enable-treebook use wxTreebook class], wxUSE_TREEBOOK)
WX_ARG_ENABLE(toolbook, [ --enable-toolbook use wxToolbook class], wxUSE_TOOLBOOK)
WX_ARG_ENABLE(treectrl, [ --enable-treectrl use wxTreeCtrl class], wxUSE_TREECTRL)
@ -6608,24 +6603,13 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
fi
fi
if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
AC_DEFINE(wxUSE_TOOLBAR_SIMPLE)
wxUSE_TOOLBAR="yes"
USES_CONTROLS=1
fi
if test "$wxUSE_TOOLBAR" = "yes"; then
AC_DEFINE(wxUSE_TOOLBAR)
USES_CONTROLS=1
dnl if wxUSE_TOOLBAR and !wxUSE_TOOLBAR_SIMPLE => wxUSE_TOOLBAR_NATIVE
if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
wxUSE_TOOLBAR_NATIVE="yes"
fi
wxUSE_TOOLBAR_NATIVE="yes"
if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
AC_DEFINE(wxUSE_TOOLBAR_NATIVE)
USES_CONTROLS=1
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"

9
include/wx/chkconf.h
View File

@ -1623,15 +1623,6 @@
# define wxUSE_TOOLBAR_NATIVE 0
# endif
# endif
# if wxUSE_TOOLBAR_SIMPLE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_TOOLBAR is set to 0 but wxUSE_TOOLBAR_SIMPLE is set to 1"
# else
# undef wxUSE_TOOLBAR_SIMPLE
# define wxUSE_TOOLBAR_SIMPLE 0
# endif
# endif
#endif
#if !wxUSE_IMAGLIST

8
include/wx/msw/setup_microwin.h
View File

@ -500,17 +500,13 @@
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless
// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which
// supports some features which might not be supported by the native wxToolBar
// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1.
// wxUSE_TOOLBAR_NATIVE is 0.
//
// Default is 1 for all settings.
//
// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for
// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility).
// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
#define wxUSE_TOOLBAR 0
#define wxUSE_TOOLBAR_NATIVE 0
#define wxUSE_TOOLBAR_SIMPLE 0
// wxNotebook is a control with several "tabs" located on one of its sides. It
// may be used ot logically organise the data presented to the user instead of

33
samples/toolbar/toolbar.cpp
View File

@ -33,9 +33,6 @@
#include "wx/image.h"
#include "wx/filedlg.h"
// define this to 1 to use wxToolBarSimple instead of the native one
#define USE_GENERIC_TBAR 0
// define this to use XPMs everywhere (by default, BMPs are used under Win)
// BMPs use less space, but aren't compiled into the executable on other platforms
#ifdef __WXMSW__
@ -44,15 +41,6 @@
#define USE_XPM_BITMAPS 1
#endif
#if USE_GENERIC_TBAR
#if !wxUSE_TOOLBAR_SIMPLE
#error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \
to 1 in setup.h and recompile the library.
#else
#include "wx/tbarsmpl.h"
#endif
#endif // USE_GENERIC_TBAR
#if USE_XPM_BITMAPS && defined(__WXMSW__) && !wxUSE_XPM_IN_MSW
#error You need to enable XPM support to use XPM bitmaps with toolbar!
#endif // USE_XPM_BITMAPS
@ -136,12 +124,6 @@ public:
void OnUpdateToggleRadioBtn(wxUpdateUIEvent& event)
{ event.Enable( m_tbar != NULL ); }
#if USE_GENERIC_TBAR
virtual wxToolBar *OnCreateToolBar(long style,
wxWindowID id,
const wxString& name );
#endif // USE_GENERIC_TBAR
private:
void DoEnablePrint();
void DoDeletePrint();
@ -376,7 +358,7 @@ void MyFrame::RecreateToolbar()
toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file"));
// the generic toolbar doesn't really support this
#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
#if wxUSE_TOOLBAR_NATIVE && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
// adding a combo to a vertical toolbar is not very smart
if ( m_horzToolbar )
{
@ -551,19 +533,6 @@ MyFrame::MyFrame(wxFrame* parent,
m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
}
#if USE_GENERIC_TBAR
wxToolBar* MyFrame::OnCreateToolBar(long style,
wxWindowID id,
const wxString& name)
{
return (wxToolBar *)new wxToolBarSimple(this, id,
wxDefaultPosition, wxDefaultSize,
style, name);
}
#endif // USE_GENERIC_TBAR
void MyFrame::LayoutChildren()
{
wxSize size = GetClientSize();

21
utils/configtool/configs/wxwin250.wxs
View File

@ -2177,7 +2177,7 @@ Default: 1. Recommended setting: 1 (there is no advantage in using the generic o
If wxUSE_TOOLBAR is 0, don't compile any toolbar
classes at all. Otherwise, use the native toolbar class unless
wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which supports some features which might not be supported by the native wxToolBar class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1.&lt;P&gt;
wxUSE_TOOLBAR_NATIVE is 0.&lt;P&gt;
Default: 1. Recommended setting: 1</description>
<default-state>1</default-state>
@ -2208,25 +2208,6 @@ Default: 1. Recommended setting: 1</description>
<help-topic>wxToolBar</help-topic>
<notes></notes>
</setting>
<setting type="bool-check">
<active>1</active>
<enabled>0</enabled>
<name>wxUSE_TOOLBAR_SIMPLE</name>
<description>Compile wxToolBarSimple, a simple generic toolbar implementation, in addition to any others that are enabled.&lt;P&gt;
This must be enabled if wxUSE_TOOLBAR_NATIVE is disabled.</description>
<default-state>1</default-state>
<requires></requires>
<precludes></precludes>
<enabled-if></enabled-if>
<enabled-if-not>wxUSE_TOOLBAR_NATIVE</enabled-if-not>
<indeterminate-if></indeterminate-if>
<exclusivity></exclusivity>
<context></context>
<configure-command>--enable-tbarsmpl</configure-command>
<help-topic>wxToolBar</help-topic>
<notes></notes>
</setting>
</setting>
<setting type="bool-check">
<active>1</active>