From: Steve Lamerton Date: Sat, 10 Sep 2011 15:09:22 +0000 (+0000) Subject: Merge in from trunk r68684 - r69046 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1d156af3247c862e51a7c62f569a3fd302052a42 Merge in from trunk r68684 - r69046 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 1d156af3247c862e51a7c62f569a3fd302052a42 diff --cc include/wx/compositewin.h index 9e7b5fd6a1,9ac62639c2..1828de0979 --- a/include/wx/compositewin.h +++ b/include/wx/compositewin.h @@@ -3,7 -3,7 +3,7 @@@ // Purpose: wxCompositeWindow<> declaration // Author: Vadim Zeitlin // Created: 2011-01-02 --// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $ ++// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --cc samples/xrc/makefile.bcc index 640ceb508d,fce255c64c..98b2e38818 --- a/samples/xrc/makefile.bcc +++ b/samples/xrc/makefile.bcc @@@ -256,7 -256,7 +256,7 @@@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS data: if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc ++ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc diff --cc samples/xrc/makefile.gcc index c0fd8fd972,5da3226c0a..8459b4b80c --- a/samples/xrc/makefile.gcc +++ b/samples/xrc/makefile.gcc @@@ -243,7 -243,7 +243,7 @@@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS data: if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc - for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc ++ for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc $(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH diff --cc samples/xrc/makefile.vc index 8cf1f97d86,3ca05cfbeb..fde3fd3c77 --- a/samples/xrc/makefile.vc +++ b/samples/xrc/makefile.vc @@@ -366,7 -366,7 +366,7 @@@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS data: if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc ++ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc diff --cc samples/xrc/makefile.wat index 6baceeba05,9bcee4fd9f..d9ab7b2cdd --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@@ -286,7 -286,7 +286,7 @@@ $(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECT data : .SYMBOLIC if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc - for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc ++ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc $(OBJS)\xrcdemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< diff --cc src/msw/anybutton.cpp index 2603cdfdf3,a2382422e7..db69814c48 --- a/src/msw/anybutton.cpp +++ b/src/msw/anybutton.cpp @@@ -3,7 -3,7 +3,7 @@@ // Purpose: wxAnyButton // Author: Julian Smart // Created: 1998-01-04 (extracted from button.cpp) --// RCS-ID: $Id: anybutton.cpp 67384 2011-04-03 20:31:32Z DS $ ++// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --cc tests/Makefile.in index c0e84f9606,9c416fea22..1fda4594c7 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -199,8 -199,8 +199,9 @@@ TEST_GUI_OBJECTS = test_gui_toolbooktest.o \ test_gui_treebooktest.o \ test_gui_treectrltest.o \ + test_gui_treelistctrltest.o \ test_gui_virtlistctrltest.o \ + test_gui_webtest.o \ test_gui_windowtest.o \ test_gui_clone.o \ test_gui_propagation.o \ diff --cc tests/makefile.bcc index d7fed8b452,bf5afd974d..081c70a0cd --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@@ -184,8 -184,8 +184,9 @@@ TEST_GUI_OBJECTS = $(OBJS)\test_gui_toolbooktest.obj \ $(OBJS)\test_gui_treebooktest.obj \ $(OBJS)\test_gui_treectrltest.obj \ - $(OBJS)\test_gui_treelistctrltest.obj \ ++ $(OBJS)\test_gui_treelistctrltest.obj \ $(OBJS)\test_gui_virtlistctrltest.obj \ + $(OBJS)\test_gui_webtest.obj \ $(OBJS)\test_gui_windowtest.obj \ $(OBJS)\test_gui_clone.obj \ $(OBJS)\test_gui_propagation.obj \ @@@ -885,6 -885,9 +890,9 @@@ $(OBJS)\test_gui_treebooktest.obj: .\co $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp -$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp - $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp - ++$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp ++ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp ++ $(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp diff --cc tests/makefile.gcc index 3ec0462e05,a0803d9b4c..1498b6a970 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@@ -177,8 -177,8 +177,9 @@@ TEST_GUI_OBJECTS = $(OBJS)\test_gui_toolbooktest.o \ $(OBJS)\test_gui_treebooktest.o \ $(OBJS)\test_gui_treectrltest.o \ - $(OBJS)\test_gui_treelistctrltest.o \ ++ $(OBJS)\test_gui_treelistctrltest.o \ $(OBJS)\test_gui_virtlistctrltest.o \ + $(OBJS)\test_gui_webtest.o \ $(OBJS)\test_gui_windowtest.o \ $(OBJS)\test_gui_clone.o \ $(OBJS)\test_gui_propagation.o \ @@@ -866,6 -866,9 +871,9 @@@ $(OBJS)\test_gui_treebooktest.o: ./cont $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\test_gui_treelistctrltest.o: ./controls/treelistctrltest.cpp - $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< - ++$(OBJS)\test_gui_treelistctrltest.o: ./controls/treelistctrltest.cpp ++ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< ++ $(OBJS)\test_gui_virtlistctrltest.o: ./controls/virtlistctrltest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< diff --cc tests/makefile.vc index 0b0e551f72,d0d4eb3efb..0442379cb7 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@@ -179,8 -179,8 +179,9 @@@ TEST_GUI_OBJECTS = $(OBJS)\test_gui_toolbooktest.obj \ $(OBJS)\test_gui_treebooktest.obj \ $(OBJS)\test_gui_treectrltest.obj \ - $(OBJS)\test_gui_treelistctrltest.obj \ ++ $(OBJS)\test_gui_treelistctrltest.obj \ $(OBJS)\test_gui_virtlistctrltest.obj \ + $(OBJS)\test_gui_webtest.obj \ $(OBJS)\test_gui_windowtest.obj \ $(OBJS)\test_gui_clone.obj \ $(OBJS)\test_gui_propagation.obj \ @@@ -1011,6 -1011,9 +1016,9 @@@ $(OBJS)\test_gui_treebooktest.obj: .\co $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treectrltest.cpp -$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp - ++$(OBJS)\test_gui_treelistctrltest.obj: .\controls\treelistctrltest.cpp ++ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\treelistctrltest.cpp ++ $(OBJS)\test_gui_virtlistctrltest.obj: .\controls\virtlistctrltest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\virtlistctrltest.cpp diff --cc tests/makefile.wat index e9f5df1e17,4a6e44d1c5..af16e37d8a --- a/tests/makefile.wat +++ b/tests/makefile.wat @@@ -428,8 -423,8 +428,9 @@@ TEST_GUI_OBJECTS = $(OBJS)\test_gui_toolbooktest.obj & $(OBJS)\test_gui_treebooktest.obj & $(OBJS)\test_gui_treectrltest.obj & - $(OBJS)\test_gui_treelistctrltest.obj & ++ $(OBJS)\test_gui_treelistctrltest.obj & $(OBJS)\test_gui_virtlistctrltest.obj & + $(OBJS)\test_gui_webtest.obj & $(OBJS)\test_gui_windowtest.obj & $(OBJS)\test_gui_clone.obj & $(OBJS)\test_gui_propagation.obj & @@@ -925,7 -924,10 +930,10 @@@ $(OBJS)\test_gui_treebooktest.obj : .A $(OBJS)\test_gui_treectrltest.obj : .AUTODEPEND .\controls\treectrltest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + -$(OBJS)\test_gui_treelistctrltest.obj : .AUTODEPEND .\controls\treelistctrltest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< - ++$(OBJS)\test_gui_treelistctrltest.obj : .AUTODEPEND .\controls\treelistctrltest.cpp ++ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\test_gui_virtlistctrltest.obj : .AUTODEPEND .\controls\virtlistctrltest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< diff --cc tests/test.bkl index a913c3487d,75403f58ae..a35147fddd --- a/tests/test.bkl +++ b/tests/test.bkl @@@ -180,8 -180,8 +180,9 @@@ controls/toolbooktest.cpp controls/treebooktest.cpp controls/treectrltest.cpp + controls/treelistctrltest.cpp controls/virtlistctrltest.cpp + controls/webtest.cpp controls/windowtest.cpp events/clone.cpp events/propagation.cpp diff --cc tests/test_test_gui.dsp index 612f85dcd0,50f7474723..baeb86696c --- a/tests/test_test_gui.dsp +++ b/tests/test_test_gui.dsp @@@ -537,6 -537,10 +537,10 @@@ SOURCE=.\controls\treectrltest.cp # End Source File # Begin Source File -SOURCE=.\controls\treelistctrltest.cpp -# End Source File -# Begin Source File - ++SOURCE=.\controls\treelistctrltest.cpp ++# End Source File ++# Begin Source File ++ SOURCE=.\validators\valnum.cpp # End Source File # Begin Source File diff --cc tests/test_vc7_test_gui.vcproj index 1903f7b596,0147d16ee1..e237709d40 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@@ -835,7 -835,10 +835,10 @@@ + - - ++ + + - - ++ + diff --cc tests/test_vc9_test_gui.vcproj index 0eca904404,ea56ae908d..2871094105 --- a/tests/test_vc9_test_gui.vcproj +++ b/tests/test_vc9_test_gui.vcproj @@@ -1159,7 -1159,11 +1159,11 @@@ RelativePath=".\controls\treectrltest.cpp" > + - - ++ +