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

Updates for wxToolbook class

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-01-30 15:38:51 +00:00
parent 3c55b3652b
commit 7dcea26b0b
10 changed files with 2046 additions and 1893 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.in
View File

@ -2170,7 +2170,6 @@ COND_TOOLKIT_MSW_GUI_HDR = \
wx/msw/minifram.h \
wx/msw/missing.h \
wx/msw/msgdlg.h \
wx/msw/mslu.h \
wx/msw/msvcrt.h \
wx/msw/notebook.h \
wx/msw/ole/access.h \
@ -2368,7 +2367,6 @@ COND_TOOLKIT_WINCE_GUI_HDR = \
wx/msw/minifram.h \
wx/msw/missing.h \
wx/msw/msgdlg.h \
wx/msw/mslu.h \
wx/msw/msvcrt.h \
wx/msw/notebook.h \
wx/msw/ole/access.h \
@ -2753,6 +2751,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/tbarbase.h \
wx/tglbtn.h \
wx/tipwin.h \
wx/toolbook.h \
wx/tooltip.h \
wx/toplevel.h \
wx/treebase.h \
@ -3213,6 +3212,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
monodll_splitter.o \
monodll_textdlgg.o \
monodll_tipwin.o \
monodll_toolbkg.o \
monodll_treectlg.o \
monodll_treebkg.o \
monodll_vlbox.o \
@ -3363,6 +3363,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
monodll_splitter.o \
monodll_textdlgg.o \
monodll_tipwin.o \
monodll_toolbkg.o \
monodll_treectlg.o \
monodll_treebkg.o \
monodll_vlbox.o \
@ -4825,6 +4826,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
monolib_splitter.o \
monolib_textdlgg.o \
monolib_tipwin.o \
monolib_toolbkg.o \
monolib_treectlg.o \
monolib_treebkg.o \
monolib_vlbox.o \
@ -4975,6 +4977,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
monolib_splitter.o \
monolib_textdlgg.o \
monolib_tipwin.o \
monolib_toolbkg.o \
monolib_treectlg.o \
monolib_treebkg.o \
monolib_vlbox.o \
@ -6663,6 +6666,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
coredll_splitter.o \
coredll_textdlgg.o \
coredll_tipwin.o \
coredll_toolbkg.o \
coredll_treectlg.o \
coredll_treebkg.o \
coredll_vlbox.o \
@ -6813,6 +6817,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
coredll_splitter.o \
coredll_textdlgg.o \
coredll_tipwin.o \
coredll_toolbkg.o \
coredll_treectlg.o \
coredll_treebkg.o \
coredll_vlbox.o \
@ -7989,6 +7994,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
corelib_splitter.o \
corelib_textdlgg.o \
corelib_tipwin.o \
corelib_toolbkg.o \
corelib_treectlg.o \
corelib_treebkg.o \
corelib_vlbox.o \
@ -8139,6 +8145,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
corelib_splitter.o \
corelib_textdlgg.o \
corelib_tipwin.o \
corelib_toolbkg.o \
corelib_treectlg.o \
corelib_treebkg.o \
corelib_vlbox.o \
@ -14616,6 +14623,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@monodll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
@COND_USE_GUI_1@monodll_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
@COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
@ -18378,6 +18388,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@monolib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
@COND_USE_GUI_1@monolib_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
@COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
@ -22524,6 +22537,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@coredll_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
@COND_USE_GUI_1@coredll_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
@COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
@ -25287,6 +25303,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@corelib_tipwin.o: $(srcdir)/src/generic/tipwin.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tipwin.cpp
@COND_USE_GUI_1@corelib_toolbkg.o: $(srcdir)/src/generic/toolbkg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/toolbkg.cpp
@COND_USE_GUI_1@corelib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/treectlg.cpp
@ -26322,6 +26341,7 @@ ALL_DIST: distrib_clean
$(CP_P) $(WXDIR)/configure $(DISTDIR)
$(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/acinclude.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/aclocal.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/config.sub $(DISTDIR)
$(CP_P) $(WXDIR)/config.guess $(DISTDIR)

2
build/bakefiles/files.bkl
View File

@ -634,6 +634,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/splitter.cpp
src/generic/textdlgg.cpp
src/generic/tipwin.cpp
src/generic/toolbkg.cpp
src/generic/treectlg.cpp
src/generic/treebkg.cpp
src/generic/vlbox.cpp
@ -800,6 +801,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/tbarbase.h
wx/tglbtn.h
wx/tipwin.h
wx/toolbook.h
wx/tooltip.h
wx/toplevel.h
wx/treebase.h

1
build/bakefiles/make_dist.mk
View File

@ -78,6 +78,7 @@ ALL_DIST: distrib_clean
$(CP_P) $(WXDIR)/configure $(DISTDIR)
$(CP_P) $(WXDIR)/autoconf_inc.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/wxwin.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/acinclude.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/aclocal.m4 $(DISTDIR)
$(CP_P) $(WXDIR)/config.sub $(DISTDIR)
$(CP_P) $(WXDIR)/config.guess $(DISTDIR)

28
build/msw/makefile.bcc
View File

@ -1330,6 +1330,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_splitter.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_toolbkg.obj \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
@ -1528,6 +1529,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_splitter.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_toolbkg.obj \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
@ -1860,6 +1862,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_splitter.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_toolbkg.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
@ -2058,6 +2061,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_splitter.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_toolbkg.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
@ -2324,6 +2328,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_splitter.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_toolbkg.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
@ -2522,6 +2527,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_splitter.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_toolbkg.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
@ -2723,6 +2729,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_splitter.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_toolbkg.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
@ -2921,6 +2928,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_splitter.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_toolbkg.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
@ -5619,6 +5627,11 @@ $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@ -7354,6 +7367,11 @@ $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@ -9158,6 +9176,11 @@ $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@ -10302,6 +10325,11 @@ $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

28
build/msw/makefile.gcc
View File

@ -1340,6 +1340,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_splitter.o \
$(OBJS)\monodll_textdlgg.o \
$(OBJS)\monodll_tipwin.o \
$(OBJS)\monodll_toolbkg.o \
$(OBJS)\monodll_treectlg.o \
$(OBJS)\monodll_treebkg.o \
$(OBJS)\monodll_vlbox.o \
@ -1540,6 +1541,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_splitter.o \
$(OBJS)\monodll_textdlgg.o \
$(OBJS)\monodll_tipwin.o \
$(OBJS)\monodll_toolbkg.o \
$(OBJS)\monodll_treectlg.o \
$(OBJS)\monodll_treebkg.o \
$(OBJS)\monodll_vlbox.o \
@ -1876,6 +1878,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_splitter.o \
$(OBJS)\monolib_textdlgg.o \
$(OBJS)\monolib_tipwin.o \
$(OBJS)\monolib_toolbkg.o \
$(OBJS)\monolib_treectlg.o \
$(OBJS)\monolib_treebkg.o \
$(OBJS)\monolib_vlbox.o \
@ -2076,6 +2079,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_splitter.o \
$(OBJS)\monolib_textdlgg.o \
$(OBJS)\monolib_tipwin.o \
$(OBJS)\monolib_toolbkg.o \
$(OBJS)\monolib_treectlg.o \
$(OBJS)\monolib_treebkg.o \
$(OBJS)\monolib_vlbox.o \
@ -2356,6 +2360,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_splitter.o \
$(OBJS)\coredll_textdlgg.o \
$(OBJS)\coredll_tipwin.o \
$(OBJS)\coredll_toolbkg.o \
$(OBJS)\coredll_treectlg.o \
$(OBJS)\coredll_treebkg.o \
$(OBJS)\coredll_vlbox.o \
@ -2556,6 +2561,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_splitter.o \
$(OBJS)\coredll_textdlgg.o \
$(OBJS)\coredll_tipwin.o \
$(OBJS)\coredll_toolbkg.o \
$(OBJS)\coredll_treectlg.o \
$(OBJS)\coredll_treebkg.o \
$(OBJS)\coredll_vlbox.o \
@ -2763,6 +2769,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_splitter.o \
$(OBJS)\corelib_textdlgg.o \
$(OBJS)\corelib_tipwin.o \
$(OBJS)\corelib_toolbkg.o \
$(OBJS)\corelib_treectlg.o \
$(OBJS)\corelib_treebkg.o \
$(OBJS)\corelib_vlbox.o \
@ -2963,6 +2970,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_splitter.o \
$(OBJS)\corelib_textdlgg.o \
$(OBJS)\corelib_tipwin.o \
$(OBJS)\corelib_toolbkg.o \
$(OBJS)\corelib_treectlg.o \
$(OBJS)\corelib_treebkg.o \
$(OBJS)\corelib_vlbox.o \
@ -5814,6 +5822,11 @@ $(OBJS)\monodll_tipwin.o: ../../src/generic/tipwin.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_toolbkg.o: ../../src/generic/toolbkg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_treectlg.o: ../../src/generic/treectlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -7649,6 +7662,11 @@ $(OBJS)\monolib_tipwin.o: ../../src/generic/tipwin.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_toolbkg.o: ../../src/generic/toolbkg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_treectlg.o: ../../src/generic/treectlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -9553,6 +9571,11 @@ $(OBJS)\coredll_tipwin.o: ../../src/generic/tipwin.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_toolbkg.o: ../../src/generic/toolbkg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_treectlg.o: ../../src/generic/treectlg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@ -10797,6 +10820,11 @@ $(OBJS)\corelib_tipwin.o: ../../src/generic/tipwin.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_toolbkg.o: ../../src/generic/toolbkg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_treectlg.o: ../../src/generic/treectlg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

28
build/msw/makefile.vc
View File

@ -1488,6 +1488,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_splitter.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_toolbkg.obj \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
@ -1686,6 +1687,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_splitter.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_toolbkg.obj \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
@ -2024,6 +2026,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_splitter.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_toolbkg.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
@ -2222,6 +2225,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_splitter.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_toolbkg.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
@ -2518,6 +2522,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_splitter.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_toolbkg.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
@ -2716,6 +2721,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_splitter.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_toolbkg.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
@ -2923,6 +2929,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_splitter.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_toolbkg.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
@ -3121,6 +3128,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_splitter.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_toolbkg.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
@ -5927,6 +5935,11 @@ $(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@ -7662,6 +7675,11 @@ $(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@ -9466,6 +9484,11 @@ $(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@ -10610,6 +10633,11 @@ $(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

3802
build/msw/makefile.wat
View File

File diff suppressed because it is too large Load Diff

4
build/msw/wx_base.dsp
View File

@ -1299,6 +1299,10 @@ SOURCE=..\..\include\wx\msw\mimetype.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\mslu.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\private.h
# End Source File
# Begin Source File

12
build/msw/wx_core.dsp
View File

@ -4783,6 +4783,10 @@ SOURCE=..\..\src\generic\tipwin.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\toolbkg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\treebkg.cpp
# End Source File
# Begin Source File
@ -7811,10 +7815,6 @@ SOURCE=..\..\include\wx\msw\msgdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\mslu.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\msvcrt.h
# End Source File
# Begin Source File
@ -8967,6 +8967,10 @@ SOURCE=..\..\include\wx\toolbar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\toolbook.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\tooltip.h
# End Source File
# Begin Source File

10
configure.in
View File

@ -537,6 +537,7 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TREEBOOK=no
DEFAULT_wxUSE_TOOLBOOK=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
DEFAULT_wxUSE_TIPWINDOW=no
@ -738,6 +739,7 @@ else
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TREEBOOK=yes
DEFAULT_wxUSE_TOOLBOOK=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
DEFAULT_wxUSE_TIPWINDOW=yes
@ -1045,6 +1047,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TOOLTIPS=yes
DEFAULT_wxUSE_TREEBOOK=yes
DEFAULT_wxUSE_TOOLBOOK=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
DEFAULT_wxUSE_TIPWINDOW=yes
@ -1087,6 +1090,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREEBOOK=no
DEFAULT_wxUSE_TOOLBOOK=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
DEFAULT_wxUSE_TIPWINDOW=no
@ -1132,6 +1136,7 @@ WX_ARG_ENABLE(toolbar, [ --enable-toolbar use wxToolBar class], wxUS
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)
WX_ARG_ENABLE(tipwindow, [ --enable-tipwindow use wxTipWindow class], wxUSE_TIPWINDOW)
WX_ARG_ENABLE(popupwin, [ --enable-popupwin use wxPopUpWindow class], wxUSE_POPUPWIN)
@ -6473,6 +6478,11 @@ if test "$wxUSE_TREEBOOK" = "yes"; then
USES_CONTROLS=1
fi
if test "$wxUSE_TOOLBOOK" = "yes"; then
AC_DEFINE(wxUSE_TOOLBOOK)
USES_CONTROLS=1
fi
if test "$wxUSE_TREECTRL" = "yes"; then
if test "$wxUSE_IMAGLIST" = "yes"; then
AC_DEFINE(wxUSE_TREECTRL)