Add collpane headers to files.bkl, and also collpaneg.cpp for OSX, and rebake

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

diff --git a/Makefile.in b/Makefile.in
index afcfda641f4075feda20f5d29559b791e12bceaa..d7c6d59b7e4f99dace111cad434ccf8a8684c957 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1999,6 +1999,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
        wx/gtk/combobox.h \
        wx/gtk/control.h \
        wx/gtk/clrpicker.h \
        wx/gtk/combobox.h \
        wx/gtk/control.h \
        wx/gtk/clrpicker.h \

+       wx/gtk/collpane.h \

        wx/gtk/dialog.h \
        wx/gtk/dirdlg.h \
        wx/gtk/filedlg.h \
        wx/gtk/dialog.h \
        wx/gtk/dirdlg.h \
        wx/gtk/filedlg.h \


@@ -2781,6 +2782,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/checklst.h \
        wx/choicdlg.h \
        wx/choice.h \
        wx/checklst.h \
        wx/choicdlg.h \
        wx/choice.h \

+       wx/collpane.h \

        wx/cmndata.h \
        wx/combo.h \
        wx/combobox.h \
        wx/cmndata.h \
        wx/combo.h \
        wx/combobox.h \


@@ -2806,6 +2808,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/generic/buttonbar.h \
        wx/generic/choicdgg.h \
        wx/generic/clrpickerg.h \
        wx/generic/buttonbar.h \
        wx/generic/choicdgg.h \
        wx/generic/clrpickerg.h \

+       wx/generic/colpaneg.h \

        wx/generic/colrdlgg.h \
        wx/generic/combo.h \
        wx/generic/dcpsg.h \
        wx/generic/colrdlgg.h \
        wx/generic/combo.h \
        wx/generic/dcpsg.h \


@@ -4206,6 +4209,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_toplevel.o \
        monodll_window.o \
        monodll_caret.o \
        monodll_toplevel.o \
        monodll_window.o \
        monodll_caret.o \

+       monodll_collpaneg.o \

        monodll_fdrepdlg.o \
        monodll_fontdlgg.o \
        monodll_listctrl.o \
        monodll_fdrepdlg.o \
        monodll_fontdlgg.o \
        monodll_listctrl.o \


@@ -5955,6 +5959,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_toplevel.o \
        monolib_window.o \
        monolib_caret.o \
        monolib_toplevel.o \
        monolib_window.o \
        monolib_caret.o \

+       monolib_collpaneg.o \

        monolib_fdrepdlg.o \
        monolib_fontdlgg.o \
        monolib_listctrl.o \
        monolib_fdrepdlg.o \
        monolib_fontdlgg.o \
        monolib_listctrl.o \


@@ -7916,6 +7921,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_toplevel.o \
        coredll_window.o \
        coredll_caret.o \
        coredll_toplevel.o \
        coredll_window.o \
        coredll_caret.o \

+       coredll_collpaneg.o \

        coredll_fdrepdlg.o \
        coredll_fontdlgg.o \
        coredll_listctrl.o \
        coredll_fdrepdlg.o \
        coredll_fontdlgg.o \
        coredll_listctrl.o \


@@ -9349,6 +9355,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_toplevel.o \
        corelib_window.o \
        corelib_caret.o \
        corelib_toplevel.o \
        corelib_window.o \
        corelib_caret.o \

+       corelib_collpaneg.o \

        corelib_fdrepdlg.o \
        corelib_fontdlgg.o \
        corelib_listctrl.o \
        corelib_fdrepdlg.o \
        corelib_fontdlgg.o \
        corelib_listctrl.o \


@@ -14431,6 +14438,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 

+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+

 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 


@@ -18502,6 +18512,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 

+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+

 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 


@@ -22939,6 +22952,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 

+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+

 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 


@@ -25867,6 +25883,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 

+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+

 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index c1c6e0116e08b6115fbf379d2fcd982b23c729e5..5f499e6578451e7b35bdc3136f73111330156dcc 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -676,6 +676,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h

+    wx/collpane.h

     wx/cmndata.h
     wx/combo.h
     wx/combobox.h
     wx/cmndata.h
     wx/combo.h
     wx/combobox.h


@@ -701,6 +702,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/buttonbar.h
     wx/generic/choicdgg.h
     wx/generic/clrpickerg.h
     wx/generic/buttonbar.h
     wx/generic/choicdgg.h
     wx/generic/clrpickerg.h

+    wx/generic/colpaneg.h

     wx/generic/colrdlgg.h
     wx/generic/combo.h
     wx/generic/dcpsg.h
     wx/generic/colrdlgg.h
     wx/generic/combo.h
     wx/generic/dcpsg.h


@@ -1024,6 +1026,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/combobox.h
     wx/gtk/control.h
     wx/gtk/clrpicker.h
     wx/gtk/combobox.h
     wx/gtk/control.h
     wx/gtk/clrpicker.h

+    wx/gtk/collpane.h

     wx/gtk/dialog.h
     wx/gtk/dirdlg.h
     wx/gtk/filedlg.h
     wx/gtk/dialog.h
     wx/gtk/dirdlg.h
     wx/gtk/filedlg.h


@@ -2130,6 +2133,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
     src/mac/carbon/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp

+    src/generic/collpaneg.cpp

     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/generic/listctrl.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/generic/listctrl.cpp

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index a953a4c630d1e8a6762c140615a8b4923c2e60bd..ece2dcd2635fccf02a387775758bf519104a9fee 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -8201,6 +8201,10 @@ SOURCE=..\..\include\wx\generic\clrpickerg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\..\include\wx\generic\colpaneg.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File


@@ -8697,6 +8701,10 @@ SOURCE=..\..\include\wx\cmndata.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\..\include\wx\collpane.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\..\include\wx\colordlg.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\colordlg.h
 # End Source File
 # Begin Source File

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 4d18ef9f622fb024aa239b00b2216db69632a78c..afc9a5644d87e575c2bf7094128073e5cb34c73a 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -2343,6 +2343,10 @@ SOURCE=..\include\wx\cmndata.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\collpane.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\colordlg.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\colordlg.h
 # End Source File
 # Begin Source File


@@ -4199,6 +4203,10 @@ SOURCE=..\include\wx\generic\clrpickerg.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\include\wx\generic\colpaneg.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File
 SOURCE=..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File