restore tabg.h and tabg.cpp for wxMotif

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

diff --git a/Makefile.in b/Makefile.in
index e2b98fd73eecfb43367e506d9da56896b4bd70ef..b17bd1138042775e12eae474be3a66d89071dccf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2649,6 +2649,7 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
        wx/generic/prntdlgg.h \
        wx/generic/statline.h \
        wx/generic/statusbr.h \
        wx/generic/prntdlgg.h \
        wx/generic/statline.h \
        wx/generic/statusbr.h \

+       wx/generic/tabg.h \

        wx/motif/accel.h \
        wx/motif/app.h \
        wx/motif/bmpbuttn.h \
        wx/motif/accel.h \
        wx/motif/app.h \
        wx/motif/bmpbuttn.h \


@@ -5033,7 +5034,8 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_generic_notebook.o \
        monodll_prntdlgg.o \
        monodll_generic_statline.o \
        monodll_generic_notebook.o \
        monodll_prntdlgg.o \
        monodll_generic_statline.o \

-       monodll_generic_statusbr.o
+       monodll_generic_statusbr.o \
+       monodll_tabg.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_clrpickerg.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_clrpickerg.o \


@@ -6842,7 +6844,8 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_generic_notebook.o \
        monolib_prntdlgg.o \
        monolib_generic_statline.o \
        monolib_generic_notebook.o \
        monolib_prntdlgg.o \
        monolib_generic_statline.o \

-       monolib_generic_statusbr.o
+       monolib_generic_statusbr.o \
+       monolib_tabg.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_clrpickerg.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_clrpickerg.o \


@@ -8798,7 +8801,8 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_generic_notebook.o \
        coredll_prntdlgg.o \
        coredll_generic_statline.o \
        coredll_generic_notebook.o \
        coredll_prntdlgg.o \
        coredll_generic_statline.o \

-       coredll_generic_statusbr.o
+       coredll_generic_statusbr.o \
+       coredll_tabg.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_clrpickerg.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_clrpickerg.o \


@@ -10302,7 +10306,8 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_generic_notebook.o \
        corelib_prntdlgg.o \
        corelib_generic_statline.o \
        corelib_generic_notebook.o \
        corelib_prntdlgg.o \
        corelib_generic_statline.o \

-       corelib_generic_statusbr.o
+       corelib_generic_statusbr.o \
+       corelib_tabg.o

 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_clrpickerg.o \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_clrpickerg.o \


@@ -14875,6 +14880,9 @@ monodll_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONODLL_ODEP)
 monodll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
 
 monodll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
 

+monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+

 monodll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
 
 monodll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
 


@@ -19528,6 +19536,9 @@ monolib_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONOLIB_ODEP)
 monolib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
 
 monolib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
 

+monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+

 monolib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
 
 monolib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
 


@@ -24841,6 +24852,9 @@ coredll_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(COREDLL_ODEP)
 coredll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
 
 coredll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
 

+coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+

 coredll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
 
 coredll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
 


@@ -28324,6 +28338,9 @@ corelib_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(CORELIB_ODEP)
 corelib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
 
 corelib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
 

+corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+

 corelib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
 
 corelib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 44151139336121c2e50a704f4bfcd957cd4906f9..7aa7226e091ff627dd02f0bd0ac147c558f62494 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1403,6 +1403,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/prntdlgg.cpp
     src/generic/statline.cpp
     src/generic/statusbr.cpp
     src/generic/prntdlgg.cpp
     src/generic/statline.cpp
     src/generic/statusbr.cpp

+    src/generic/tabg.cpp

 </set>
 <set var="MOTIF_HDR" hints="files">
     wx/generic/clrpickerg.h
 </set>
 <set var="MOTIF_HDR" hints="files">
     wx/generic/clrpickerg.h


@@ -1420,6 +1421,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/prntdlgg.h
     wx/generic/statline.h
     wx/generic/statusbr.h
     wx/generic/prntdlgg.h
     wx/generic/statline.h
     wx/generic/statusbr.h

+    wx/generic/tabg.h

     wx/motif/accel.h
     wx/motif/app.h
     wx/motif/bmpbuttn.h
     wx/motif/accel.h
     wx/motif/app.h
     wx/motif/bmpbuttn.h

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index 2666ffd6014c558c773d7f7f038aaf7bcf53ed94..b95297e4f4b5843a1004bfd34d77747fb640f39e 100644 (file)
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tabg.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        tabg.h

-// Purpose:     Generic tabbed dialogs
+// Purpose:     Generic tabbed dialogs; used by wxMotif's wxNotebook

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 365b1c78f65021a13feb15ecb1619140463069ba..ca40c6010085d58b56e5b5c995377cd9d2248245 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/generic/tabg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/generic/tabg.cpp

-// Purpose:     Generic tabbed dialogs
+// Purpose:     Generic tabbed dialogs; used by wxMotif's wxNotebook

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -16,8 +16,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_TAB_DIALOG
-

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/intl.h"


@@ -29,7 +27,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
 #include <stdlib.h>
 #include <stdarg.h>
 

-#include "wx/tab.h"
+#include "wx/generic/tabg.h"

 #include "wx/listimpl.cpp"
 
 WX_DEFINE_LIST(wxTabLayerList)
 #include "wx/listimpl.cpp"
 
 WX_DEFINE_LIST(wxTabLayerList)


@@ -1289,4 +1287,3 @@ void wxPanelTabView::ShowWindowForTab(int id)
   newWindow->Refresh();
 }
 
   newWindow->Refresh();
 }
 

-#endif // wxUSE_TAB_DIALOG