fixed wxUSE_TABDIALOG/TAB_DIALOG confusion and other fixes to prevent wxTabCtrl from being built into the library unnecessarily (patch 1416049)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -530,7 +530,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_STATLINE=no
|
||||
DEFAULT_wxUSE_STATTEXT=no
|
||||
DEFAULT_wxUSE_STATUSBAR=yes
|
||||
DEFAULT_wxUSE_TABDIALOG=no
|
||||
DEFAULT_wxUSE_TAB_DIALOG=no
|
||||
DEFAULT_wxUSE_TEXTCTRL=no
|
||||
DEFAULT_wxUSE_TOGGLEBTN=no
|
||||
DEFAULT_wxUSE_TOOLBAR=no
|
||||
@@ -732,7 +732,7 @@ else
|
||||
DEFAULT_wxUSE_STATLINE=yes
|
||||
DEFAULT_wxUSE_STATTEXT=yes
|
||||
DEFAULT_wxUSE_STATUSBAR=yes
|
||||
DEFAULT_wxUSE_TABDIALOG=no
|
||||
DEFAULT_wxUSE_TAB_DIALOG=no
|
||||
DEFAULT_wxUSE_TEXTCTRL=yes
|
||||
DEFAULT_wxUSE_TOGGLEBTN=yes
|
||||
DEFAULT_wxUSE_TOOLBAR=yes
|
||||
@@ -1129,7 +1129,7 @@ WX_ARG_ENABLE(statbox, [ --enable-statbox use wxStaticBox class], wx
|
||||
WX_ARG_ENABLE(statline, [ --enable-statline use wxStaticLine class], wxUSE_STATLINE)
|
||||
WX_ARG_ENABLE(stattext, [ --enable-stattext use wxStaticText class], wxUSE_STATTEXT)
|
||||
WX_ARG_ENABLE(statusbar, [ --enable-statusbar use wxStatusBar class], wxUSE_STATUSBAR)
|
||||
WX_ARG_ENABLE(tabdialog, [ --enable-tabdialog use wxTabControl class], wxUSE_TABDIALOG)
|
||||
WX_ARG_ENABLE(tabdialog, [ --enable-tabdialog use wxTabControl class], wxUSE_TAB_DIALOG)
|
||||
WX_ARG_ENABLE(textctrl, [ --enable-textctrl use wxTextCtrl class], wxUSE_TEXTCTRL)
|
||||
WX_ARG_ENABLE(togglebtn, [ --enable-togglebtn use wxToggleButton class], wxUSE_TOGGLEBTN)
|
||||
WX_ARG_ENABLE(toolbar, [ --enable-toolbar use wxToolBar class], wxUSE_TOOLBAR)
|
||||
@@ -6412,7 +6412,7 @@ if test "$wxUSE_STATUSBAR" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_TABDIALOG" = "yes"; then
|
||||
if test "$wxUSE_TAB_DIALOG" = "yes"; then
|
||||
AC_DEFINE(wxUSE_TAB_DIALOG)
|
||||
fi
|
||||
|
||||
|
Reference in New Issue
Block a user