fixed wxUSE_TABDIALOG/TAB_DIALOG confusion and other fixes to prevent wxTabCtrl from...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 2dcbb98e058409229a339a198cd2947146e80d46..8e0fb2787a17a7980c47850fe5b665700294ac5b 100644 (file)
--- a/configure.in
+++ b/configure.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
 

diff --git a/include/wx/tab.h b/include/wx/tab.h
index c069ee7e949a4fc7c59a1d447dced9f98054ee24..d605d5935ada3f19bd12c39a504da43cce9eae1d 100644 (file)
--- a/include/wx/tab.h
+++ b/include/wx/tab.h
@@ -12,7 +12,11 @@
 #ifndef _WX_TAB_H_BASE_
 #define _WX_TAB_H_BASE_
 
+#include "wx/defs.h"
+
+#if wxUSE_TAB_DIALOG
 #include "wx/generic/tabg.h"
+#endif
 
 #endif
     // _WX_TAB_H_BASE_

diff --git a/include/wx/tabctrl.h b/include/wx/tabctrl.h
index c84b8cdc032c8163f8d15c6a24784820110244d0..55f79c79124e0765097c35633c37134b28f0c4d5 100644 (file)
--- a/include/wx/tabctrl.h
+++ b/include/wx/tabctrl.h
@@ -12,6 +12,10 @@
 #ifndef _WX_TABCTRL_H_BASE_
 #define _WX_TABCTRL_H_BASE_
 
+#include "wx/defs.h"
+
+#if wxUSE_TAB_DIALOG
+
 BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGED, 800)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGING, 801)
@@ -28,5 +32,6 @@ END_DECLARE_EVENT_TYPES()
 #include "wx/os2/tabctrl.h"
 #endif
 
+#endif // wxUSE_TAB_DIALOG
 #endif
     // _WX_TABCTRL_H_BASE_

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index fdce08e0ee0e162314fbf25c11203fea327143c6..433bb55811d1976b30cc95349d43b30653e6fa4c 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -11,6 +11,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_TAB_DIALOG
+
 #include "wx/control.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"
@@ -196,3 +198,4 @@ void wxTabCtrl::SetPadding(const wxSize& padding)
     // TODO:
 }
 
+#endif // wxUSE_TAB_DIALOG

diff --git a/src/mac/classic/tabctrl.cpp b/src/mac/classic/tabctrl.cpp
index 15338f6397def7af0f2184983eeaf82ad1f8be86..a21ba6ecdd0ac36fd202423ba4c56d21af616d3e 100644 (file)
--- a/src/mac/classic/tabctrl.cpp
+++ b/src/mac/classic/tabctrl.cpp
@@ -11,6 +11,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_TAB_DIALOG
+
 #include "wx/control.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"
@@ -198,3 +200,4 @@ wxTabEvent::wxTabEvent(wxEventType commandType, int id):
 {
 }
 
+#endif // wxUSE_TAB_DIALOG

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index b2a69f6e77ad7f8909344153e5b0a7e7737071e8..f8b3ce1bcee0affdbb937da281666652363783de 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -16,6 +16,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_TAB_DIALOG
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -428,3 +430,5 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height)
 
 }
 #endif
+
+#endif // wxUSE_TAB_DIALOG

diff --git a/src/os2/tabctrl.cpp b/src/os2/tabctrl.cpp
index 8c35755897f7d42611598c9164a419db1c4914d7..17f9df9127f8686dd7580df68314f1b4fa4f12a7 100644 (file)
--- a/src/os2/tabctrl.cpp
+++ b/src/os2/tabctrl.cpp
@@ -12,6 +12,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_TAB_DIALOG
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -354,3 +356,5 @@ wxTabEvent::wxTabEvent(wxEventType commandType, int id)
            :wxCommandEvent(commandType, id)
 {
 }
+
+#endif // wxUSE_TAB_DIALOG

diff --git a/src/palmos/tabctrl.cpp b/src/palmos/tabctrl.cpp
index 68d877c8a30323755a71389c3d59207ef01c0fed..30933e9d4013eef2e8b395f26bb15614e687d1d6 100644 (file)
--- a/src/palmos/tabctrl.cpp
+++ b/src/palmos/tabctrl.cpp
@@ -16,6 +16,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_TAB_DIALOG
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -177,3 +179,4 @@ void wxTabCtrl::SetPadding(const wxSize& padding)
 #endif
     // __WIN95__
 
+#endif // wxUSE_TAB_DIALOG