From: Steve Lamerton Date: Mon, 25 Jul 2011 16:54:53 +0000 (+0000) Subject: Merge in from trunk r67662 to r64801 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec Merge in from trunk r67662 to r64801 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 906c935a80b10d53cecf57f71ab5f3f4f1d529ec diff --cc include/wx/msw/panel.h index 5073fe30ba,4761192d66..13a39dcf66 --- a/include/wx/msw/panel.h +++ b/include/wx/msw/panel.h @@@ -3,7 -3,7 +3,7 @@@ // Purpose: wxMSW-specific wxPanel class. // Author: Vadim Zeitlin // Created: 2011-03-18 --// 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 locale/it.po index 6f3791d833,6f54ffb989..a6261966ac --- a/locale/it.po +++ b/locale/it.po @@@ -1,15 -1,13 +1,13 @@@ - #: ../src/stc/scintilla/src/ScintillaBase.cxx:424 - #: ../src/stc/scintilla/src/ScintillaBase.cxx:429 msgid "" msgstr "" -"Project-Id-Version: $Id: it.po 53333 2008-04-24 07:58:37Z VS $\n" +"Project-Id-Version: $Id$\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2008-04-24 09:31+0200\n" - "PO-Revision-Date: 2006-10-30 20:46+0100\n" - "Last-Translator: Mattia Barbon \n" + "POT-Creation-Date: 2010-05-31 16:38+0200\n" + "PO-Revision-Date: 2011-06-16 14:21+0100\n" + "Last-Translator: bovirus \n" "Language-Team: wxWidgets translators \n" "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso-8859-1\n" + "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Italian\n" "X-Poedit-Country: ITALY\n" diff --cc src/msw/panel.cpp index e5b57eeb3a,c502caf9f5..be95de10b3 --- a/src/msw/panel.cpp +++ b/src/msw/panel.cpp @@@ -3,7 -3,7 +3,7 @@@ // Purpose: Implementation of wxMSW-specific wxPanel class. // Author: Vadim Zeitlin // Created: 2011-03-18 --// RCS-ID: $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $ ++// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --cc tests/makefile.bcc index da4658bfb1,3f816730c2..4dc8feebdb --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@@ -151,6 -151,7 +151,7 @@@ TEST_GUI_OBJECTS = $(OBJS)\test_gui_choicebooktest.obj \ $(OBJS)\test_gui_choicetest.obj \ $(OBJS)\test_gui_comboboxtest.obj \ - $(OBJS)\test_gui_datepickerctrltest.obj \ ++ $(OBJS)\test_gui_datepickerctrltest.obj \ $(OBJS)\test_gui_frametest.obj \ $(OBJS)\test_gui_gaugetest.obj \ $(OBJS)\test_gui_gridtest.obj \ @@@ -779,6 -780,9 +780,9 @@@ $(OBJS)\test_gui_choicetest.obj: .\cont $(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp -$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp - $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp - ++$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp ++ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp ++ $(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp diff --cc tests/makefile.gcc index 05aa99bef4,652df038ca..48f4061311 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@@ -144,6 -144,7 +144,7 @@@ TEST_GUI_OBJECTS = $(OBJS)\test_gui_choicebooktest.o \ $(OBJS)\test_gui_choicetest.o \ $(OBJS)\test_gui_comboboxtest.o \ - $(OBJS)\test_gui_datepickerctrltest.o \ ++ $(OBJS)\test_gui_datepickerctrltest.o \ $(OBJS)\test_gui_frametest.o \ $(OBJS)\test_gui_gaugetest.o \ $(OBJS)\test_gui_gridtest.o \ @@@ -760,6 -761,9 +761,9 @@@ $(OBJS)\test_gui_choicetest.o: ./contro $(OBJS)\test_gui_comboboxtest.o: ./controls/comboboxtest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\test_gui_datepickerctrltest.o: ./controls/datepickerctrltest.cpp - $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< - ++$(OBJS)\test_gui_datepickerctrltest.o: ./controls/datepickerctrltest.cpp ++ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< ++ $(OBJS)\test_gui_frametest.o: ./controls/frametest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< diff --cc tests/makefile.vc index 0de79873de,a509e659ee..c32d4fa9dd --- a/tests/makefile.vc +++ b/tests/makefile.vc @@@ -146,6 -146,7 +146,7 @@@ TEST_GUI_OBJECTS = $(OBJS)\test_gui_choicebooktest.obj \ $(OBJS)\test_gui_choicetest.obj \ $(OBJS)\test_gui_comboboxtest.obj \ - $(OBJS)\test_gui_datepickerctrltest.obj \ ++ $(OBJS)\test_gui_datepickerctrltest.obj \ $(OBJS)\test_gui_frametest.obj \ $(OBJS)\test_gui_gaugetest.obj \ $(OBJS)\test_gui_gridtest.obj \ @@@ -905,6 -906,9 +906,9 @@@ $(OBJS)\test_gui_choicetest.obj: .\cont $(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp -$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp - ++$(OBJS)\test_gui_datepickerctrltest.obj: .\controls\datepickerctrltest.cpp ++ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp ++ $(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp diff --cc tests/makefile.wat index f89e93c51d,12fca8172a..25630d784d --- a/tests/makefile.wat +++ b/tests/makefile.wat @@@ -390,6 -390,7 +390,7 @@@ TEST_GUI_OBJECTS = $(OBJS)\test_gui_choicebooktest.obj & $(OBJS)\test_gui_choicetest.obj & $(OBJS)\test_gui_comboboxtest.obj & - $(OBJS)\test_gui_datepickerctrltest.obj & ++ $(OBJS)\test_gui_datepickerctrltest.obj & $(OBJS)\test_gui_frametest.obj & $(OBJS)\test_gui_gaugetest.obj & $(OBJS)\test_gui_gridtest.obj & @@@ -819,6 -820,9 +820,9 @@@ $(OBJS)\test_gui_choicetest.obj : .AUT $(OBJS)\test_gui_comboboxtest.obj : .AUTODEPEND .\controls\comboboxtest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< -$(OBJS)\test_gui_datepickerctrltest.obj : .AUTODEPEND .\controls\datepickerctrltest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< - ++$(OBJS)\test_gui_datepickerctrltest.obj : .AUTODEPEND .\controls\datepickerctrltest.cpp ++ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< ++ $(OBJS)\test_gui_frametest.obj : .AUTODEPEND .\controls\frametest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< diff --cc tests/test_test_gui.dsp index 9fd20781c2,4ebfd62727..c4f64ae8bd --- a/tests/test_test_gui.dsp +++ b/tests/test_test_gui.dsp @@@ -307,6 -307,10 +307,10 @@@ SOURCE=.\config\config.cp # End Source File # Begin Source File -SOURCE=.\controls\datepickerctrltest.cpp -# End Source File -# Begin Source File - ++SOURCE=.\controls\datepickerctrltest.cpp ++# End Source File ++# Begin Source File ++ SOURCE=.\dummy.cpp # ADD BASE CPP /Yc"testprec.h" # ADD CPP /Yc"testprec.h" diff --cc tests/test_vc7_test_gui.vcproj index 861d041cec,344e7b1059..b598f0dcb6 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@@ -619,7 -619,10 +619,10 @@@ + - - ++ + diff --cc tests/test_vc8_test_gui.vcproj index 8bfa56f191,978c1aa733..e9e80d2a0f --- a/tests/test_vc8_test_gui.vcproj +++ b/tests/test_vc8_test_gui.vcproj @@@ -897,9 -897,13 +897,13 @@@ + + - - + + + + - - + +