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

diff --cc build/bakefiles/files.bkl
Simple merge

diff --cc configure.in
Simple merge

diff --cc include/wx/dlimpexp.h
Simple merge

diff --cc include/wx/msw/panel.h
index 5073fe30baddb903d80e5c32dd84fc0faa3ef737,4761192d66dd594f60a01a669a2cd920c69682e2..13a39dcf664ec41475ff69b02c7eeb97b764c88d
--- 1/include/wx/msw/panel.h
--- 2/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 <vadim@wxwidgets.org>
  // Licence:     wxWindows licence
  ///////////////////////////////////////////////////////////////////////////////

diff --cc include/wx/msw/setup0.h
Simple merge

diff --cc include/wx/setup_inc.h
Simple merge

diff --cc locale/it.po
index 6f3791d83386554280eca0932b59801dd431f55d,6f54ffb989b0be4825bee99468f06aef855f391f..a6261966ac84128300ebe8445c544979fd15fe6e
--- 1/locale/it.po
--- 2/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 <mbarbon@cpan.org>\n"
+ "POT-Creation-Date: 2010-05-31 16:38+0200\n"
+ "PO-Revision-Date: 2011-06-16 14:21+0100\n"
+ "Last-Translator: bovirus <bovirus@live.it>\n"
  "Language-Team: wxWidgets translators <wx-translators@lists.wxwidgets.org>\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 e5b57eeb3af095b1115568f02064ac8a3f4b5025,c502caf9f5655145b01dddde65365ce11ed00b91..be95de10b3ef796b0edcd87ec5484f957a1228ff
--- 1/src/msw/panel.cpp
--- 2/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 <vadim@wxwidgets.org>
  // Licence:     wxWindows licence
  ///////////////////////////////////////////////////////////////////////////////

diff --cc tests/makefile.bcc
index da4658bfb1b18b007be30310a8d219afc0074888,3f816730c28f8ec542e88157ccf43477bcab31a4..4dc8feebdb8938074b0a78e85d6813eac84f67ae
--- 1/tests/makefile.bcc
--- 2/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@@ -151,6 -151,7 +151,7 @@@ TEST_GUI_OBJECTS =  
        $(OBJS)\test_gui_choicebooktest.obj \\r
        $(OBJS)\test_gui_choicetest.obj \\r
        $(OBJS)\test_gui_comboboxtest.obj \\r
 -      $(OBJS)\test_gui_datepickerctrltest.obj \
++      $(OBJS)\test_gui_datepickerctrltest.obj \\r
        $(OBJS)\test_gui_frametest.obj \\r
        $(OBJS)\test_gui_gaugetest.obj \\r
        $(OBJS)\test_gui_gridtest.obj \\r
@@@ -779,6 -780,9 +780,9 @@@ $(OBJS)\test_gui_choicetest.obj: .\cont
  $(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp\r
  \r
 -$(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\r
++      $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp\r
++\r
  $(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp\r
  \r

diff --cc tests/makefile.gcc
index 05aa99bef412a9a1b156d67c8ea0907d17972da4,652df038cad17accb674f756836cbf4e8ad81135..48f40613116235f139f7e9f77db39924468ba4ca
--- 1/tests/makefile.gcc
--- 2/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@@ -144,6 -144,7 +144,7 @@@ TEST_GUI_OBJECTS =  
        $(OBJS)\test_gui_choicebooktest.o \\r
        $(OBJS)\test_gui_choicetest.o \\r
        $(OBJS)\test_gui_comboboxtest.o \\r
 -      $(OBJS)\test_gui_datepickerctrltest.o \
++      $(OBJS)\test_gui_datepickerctrltest.o \\r
        $(OBJS)\test_gui_frametest.o \\r
        $(OBJS)\test_gui_gaugetest.o \\r
        $(OBJS)\test_gui_gridtest.o \\r
@@@ -760,6 -761,9 +761,9 @@@ $(OBJS)\test_gui_choicetest.o: ./contro
  $(OBJS)\test_gui_comboboxtest.o: ./controls/comboboxtest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
  \r
 -$(OBJS)\test_gui_datepickerctrltest.o: ./controls/datepickerctrltest.cpp
 -      $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 -
++$(OBJS)\test_gui_datepickerctrltest.o: ./controls/datepickerctrltest.cpp\r
++      $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
++\r
  $(OBJS)\test_gui_frametest.o: ./controls/frametest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
  \r

diff --cc tests/makefile.vc
index 0de79873de17aa674e9b05ae8402f4682f99e099,a509e659eed4e66c1b4de9b7ef80b1cc3ad91bd6..c32d4fa9dd1a5229b5672ce0429ca5dfdf2ff39e
--- 1/tests/makefile.vc
--- 2/tests/makefile.vc
+++ b/tests/makefile.vc
@@@ -146,6 -146,7 +146,7 @@@ TEST_GUI_OBJECTS =  
        $(OBJS)\test_gui_choicebooktest.obj \\r
        $(OBJS)\test_gui_choicetest.obj \\r
        $(OBJS)\test_gui_comboboxtest.obj \\r
 -      $(OBJS)\test_gui_datepickerctrltest.obj \
++      $(OBJS)\test_gui_datepickerctrltest.obj \\r
        $(OBJS)\test_gui_frametest.obj \\r
        $(OBJS)\test_gui_gaugetest.obj \\r
        $(OBJS)\test_gui_gridtest.obj \\r
@@@ -905,6 -906,9 +906,9 @@@ $(OBJS)\test_gui_choicetest.obj: .\cont
  $(OBJS)\test_gui_comboboxtest.obj: .\controls\comboboxtest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\comboboxtest.cpp\r
  \r
 -$(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\r
++      $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\datepickerctrltest.cpp\r
++\r
  $(OBJS)\test_gui_frametest.obj: .\controls\frametest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\frametest.cpp\r
  \r

diff --cc tests/makefile.wat
index f89e93c51d4cae8b2d6ce76109121fbd101ed078,12fca8172ad8d4383b0b520f81cfe90981420b3b..25630d784ddd3a95813101d79aeea088ed97c9e5
--- 1/tests/makefile.wat
--- 2/tests/makefile.wat
+++ b/tests/makefile.wat
@@@ -390,6 -390,7 +390,7 @@@ TEST_GUI_OBJECTS =  
        $(OBJS)\test_gui_choicebooktest.obj &\r
        $(OBJS)\test_gui_choicetest.obj &\r
        $(OBJS)\test_gui_comboboxtest.obj &\r
 -      $(OBJS)\test_gui_datepickerctrltest.obj &
++      $(OBJS)\test_gui_datepickerctrltest.obj &\r
        $(OBJS)\test_gui_frametest.obj &\r
        $(OBJS)\test_gui_gaugetest.obj &\r
        $(OBJS)\test_gui_gridtest.obj &\r
@@@ -819,6 -820,9 +820,9 @@@ $(OBJS)\test_gui_choicetest.obj :  .AUT
  $(OBJS)\test_gui_comboboxtest.obj :  .AUTODEPEND .\controls\comboboxtest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
  \r
 -$(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\r
++      $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
++\r
  $(OBJS)\test_gui_frametest.obj :  .AUTODEPEND .\controls\frametest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
  \r

diff --cc tests/test.bkl
Simple merge

diff --cc tests/test_test_gui.dsp
index 9fd20781c21b6f707de2c95a2270fff0582dfcf6,4ebfd627270773ac05d22eebf0b1ac04dcd5a2fc..c4f64ae8bd32fbcab93c3131145172f432eeae3d
--- 1/tests/test_test_gui.dsp
--- 2/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@@ -307,6 -307,10 +307,10 @@@ SOURCE=.\config\config.cp
  # End Source File\r
  # Begin Source File\r
  \r
 -SOURCE=.\controls\datepickerctrltest.cpp
 -# End Source File
 -# Begin Source File
 -
++SOURCE=.\controls\datepickerctrltest.cpp\r
++# End Source File\r
++# Begin Source File\r
++\r
  SOURCE=.\dummy.cpp\r
  # ADD BASE CPP /Yc"testprec.h"\r
  # ADD CPP /Yc"testprec.h"\r

diff --cc tests/test_vc7_test_gui.vcproj
index 861d041cec3cb5b78d78dd6001f89e4378f9729f,344e7b10594117254548dfc5d5ede661f44b4e5a..b598f0dcb616bbda28196e600ec9fac552aa2693
--- 1/tests/test_vc7_test_gui.vcproj
--- 2/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@@ -619,7 -619,10 +619,10 @@@
                        <File\r
                                RelativePath=".\config\config.cpp">\r
                        </File>\r
 -                              RelativePath=".\controls\datepickerctrltest.cpp">
 -                      </File>
 -                      <File
+                       <File\r
++                              RelativePath=".\controls\datepickerctrltest.cpp">\r
++                      </File>\r
 +                      <File\r
                                RelativePath=".\dummy.cpp">\r
                                <FileConfiguration\r
                                        Name="Debug|Win32">\r

diff --cc tests/test_vc8_test_gui.vcproj
index 8bfa56f191b48a03575faec4964eb8d9996ea3e9,978c1aa7332da76ce4316b028f3e83f1131e56f9..e9e80d2a0f8a29098d016e884ba76597c6891716
--- 1/tests/test_vc8_test_gui.vcproj
--- 2/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@@ -897,9 -897,13 +897,13 @@@
                        </File>\r
                        <File\r
                                RelativePath=".\config\config.cpp"\r
 -                              RelativePath=".\controls\datepickerctrltest.cpp"
 -                              >
 -                      </File>
 -                      <File
+                               >\r
+                       </File>\r
+                       <File\r
++                              RelativePath=".\controls\datepickerctrltest.cpp"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
                                RelativePath=".\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r

diff --cc tests/test_vc9_test_gui.vcproj
index 76f09246555823805742f8fc0a324b9c43084d1f,dc18d968728c5c572fad463b44ad53f1fbd8d68e..8680942bcaef041fc4c34a999844aafcd2ca8541
--- 1/tests/test_vc9_test_gui.vcproj
--- 2/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@@ -869,9 -869,13 +869,13 @@@
                        </File>\r
                        <File\r
                                RelativePath=".\config\config.cpp"\r
 -                              RelativePath=".\controls\datepickerctrltest.cpp"
 -                              >
 -                      </File>
 -                      <File
+                               >\r
+                       </File>\r
+                       <File\r
++                              RelativePath=".\controls\datepickerctrltest.cpp"\r
 +                              >\r
 +                      </File>\r
 +                      <File\r
                                RelativePath=".\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r