Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge wxQT branch into the trunk.

Browse Source 
This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-08-24 01:50:11 +00:00
parent d513d3e2f0
commit df13791078
381 changed files with 24333 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
build/msw/makefile.bcc
View File

@@ -1986,6 +1986,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textdlg.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
@@ -2027,10 +2028,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_srchctlg.obj \
$(OBJS)\monodll_statbmpg.obj \
$(OBJS)\monodll_stattextg.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 \
$(OBJS)\monodll_vscroll.obj \
@@ -2261,6 +2260,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stockitem.obj \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textdlg.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
@@ -2302,10 +2302,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_srchctlg.obj \
$(OBJS)\monodll_statbmpg.obj \
$(OBJS)\monodll_stattextg.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 \
$(OBJS)\monodll_vscroll.obj \
@@ -2794,6 +2792,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textdlg.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
@@ -2835,10 +2834,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_srchctlg.obj \
$(OBJS)\monolib_statbmpg.obj \
$(OBJS)\monolib_stattextg.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 \
$(OBJS)\monolib_vscroll.obj \
@@ -3069,6 +3066,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stockitem.obj \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textdlg.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
@@ -3110,10 +3108,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_srchctlg.obj \
$(OBJS)\monolib_statbmpg.obj \
$(OBJS)\monolib_stattextg.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 \
$(OBJS)\monolib_vscroll.obj \
@@ -3478,6 +3474,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textdlg.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
@@ -3519,10 +3516,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_srchctlg.obj \
$(OBJS)\coredll_statbmpg.obj \
$(OBJS)\coredll_stattextg.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 \
$(OBJS)\coredll_vscroll.obj \
@@ -3753,6 +3748,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_stockitem.obj \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textdlg.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
@@ -3794,10 +3790,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_srchctlg.obj \
$(OBJS)\coredll_statbmpg.obj \
$(OBJS)\coredll_stattextg.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 \
$(OBJS)\coredll_vscroll.obj \
@@ -4038,6 +4032,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textdlg.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
@@ -4079,10 +4074,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_srchctlg.obj \
$(OBJS)\corelib_statbmpg.obj \
$(OBJS)\corelib_stattextg.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 \
$(OBJS)\corelib_vscroll.obj \
@@ -4313,6 +4306,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_stockitem.obj \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textdlg.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
@@ -4354,10 +4348,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_srchctlg.obj \
$(OBJS)\corelib_statbmpg.obj \
$(OBJS)\corelib_stattextg.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 \
$(OBJS)\corelib_vscroll.obj \
@@ -8268,6 +8260,11 @@ $(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textdlg.obj: ..\..\src\common\textdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -8473,11 +8470,6 @@ $(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -8488,11 +8480,6 @@ $(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -10739,6 +10726,11 @@ $(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textdlg.obj: ..\..\src\common\textdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -10944,11 +10936,6 @@ $(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -10959,11 +10946,6 @@ $(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -13156,6 +13138,11 @@ $(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textdlg.obj: ..\..\src\common\textdlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -13361,11 +13348,6 @@ $(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -13376,11 +13358,6 @@ $(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp
@@ -14603,6 +14580,11 @@ $(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textdlg.obj: ..\..\src\common\textdlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textdlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp
@@ -14808,11 +14790,6 @@ $(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp
@@ -14823,11 +14800,6 @@ $(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp