From 4de86c0b26242100b3914f8e6f433de870bfa0dc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 21 Nov 2013 13:47:05 +0000 Subject: [PATCH] Update version to 3.1.0. And regenerate everything. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 13 +++--- build/bakefiles/wxpresets/presets/wx.bkl | 2 +- build/msw/wx_adv.dsp | 40 +++++++++---------- build/msw/wx_aui.dsp | 40 +++++++++---------- build/msw/wx_base.dsp | 40 +++++++++---------- build/msw/wx_core.dsp | 40 +++++++++---------- build/msw/wx_gl.dsp | 40 +++++++++---------- build/msw/wx_html.dsp | 40 +++++++++---------- build/msw/wx_media.dsp | 40 +++++++++---------- build/msw/wx_net.dsp | 40 +++++++++---------- build/msw/wx_propgrid.dsp | 40 +++++++++---------- build/msw/wx_qa.dsp | 40 +++++++++---------- build/msw/wx_ribbon.dsp | 40 +++++++++---------- build/msw/wx_richtext.dsp | 40 +++++++++---------- build/msw/wx_stc.dsp | 40 +++++++++---------- build/msw/wx_webview.dsp | 40 +++++++++---------- build/msw/wx_xml.dsp | 40 +++++++++---------- build/msw/wx_xrc.dsp | 40 +++++++++---------- build/osx/wxvers.xcconfig | 4 +- build/tools/bld_chm_exe.bat | 2 +- configure | 20 +++++----- configure.in | 4 +- demos/bombs/Makefile.in | 2 +- demos/bombs/bombs.dsp | 16 ++++---- demos/bombs/bombs_vc7.vcproj | 8 ++-- demos/bombs/bombs_vc8.vcproj | 8 ++-- demos/bombs/bombs_vc9.vcproj | 8 ++-- demos/forty/Makefile.in | 2 +- demos/forty/forty.dsp | 16 ++++---- demos/forty/forty_vc7.vcproj | 8 ++-- demos/forty/forty_vc8.vcproj | 8 ++-- demos/forty/forty_vc9.vcproj | 8 ++-- demos/fractal/Makefile.in | 2 +- demos/fractal/fractal.dsp | 16 ++++---- demos/fractal/fractal_vc7.vcproj | 8 ++-- demos/fractal/fractal_vc8.vcproj | 8 ++-- demos/fractal/fractal_vc9.vcproj | 8 ++-- demos/life/Makefile.in | 2 +- demos/life/life.dsp | 16 ++++---- demos/life/life_vc7.vcproj | 8 ++-- demos/life/life_vc8.vcproj | 8 ++-- demos/life/life_vc9.vcproj | 8 ++-- demos/poem/Makefile.in | 2 +- demos/poem/poem.dsp | 16 ++++---- demos/poem/poem_vc7.vcproj | 8 ++-- demos/poem/poem_vc8.vcproj | 8 ++-- demos/poem/poem_vc9.vcproj | 8 ++-- docs/changes.txt | 4 ++ docs/doxygen/Doxyfile | 4 +- docs/doxygen/latexdocstart.inc | 2 +- docs/readme.txt | 36 ++++------------- include/wx/osx/config_xcode.h | 4 +- include/wx/version.h | 4 +- samples/Info.plist | 8 ++-- samples/access/Makefile.in | 2 +- samples/access/access.dsp | 16 ++++---- samples/access/access_vc7.vcproj | 8 ++-- samples/access/access_vc8.vcproj | 8 ++-- samples/access/access_vc9.vcproj | 8 ++-- samples/animate/Makefile.in | 2 +- samples/animate/anitest.dsp | 16 ++++---- samples/animate/anitest_vc7.vcproj | 8 ++-- samples/animate/anitest_vc8.vcproj | 8 ++-- samples/animate/anitest_vc9.vcproj | 8 ++-- samples/artprov/Makefile.in | 2 +- samples/artprov/artprov.dsp | 16 ++++---- samples/artprov/artprov_vc7.vcproj | 8 ++-- samples/artprov/artprov_vc8.vcproj | 8 ++-- samples/artprov/artprov_vc9.vcproj | 8 ++-- samples/aui/Makefile.in | 2 +- samples/aui/auidemo.dsp | 16 ++++---- samples/aui/auidemo_vc7.vcproj | 8 ++-- samples/aui/auidemo_vc8.vcproj | 8 ++-- samples/aui/auidemo_vc9.vcproj | 8 ++-- samples/calendar/Makefile.in | 2 +- samples/calendar/calendar.dsp | 16 ++++---- samples/calendar/calendar_vc7.vcproj | 8 ++-- samples/calendar/calendar_vc8.vcproj | 8 ++-- samples/calendar/calendar_vc9.vcproj | 8 ++-- samples/caret/Makefile.in | 2 +- samples/caret/caret.dsp | 16 ++++---- samples/caret/caret_vc7.vcproj | 8 ++-- samples/caret/caret_vc8.vcproj | 8 ++-- samples/caret/caret_vc9.vcproj | 8 ++-- samples/clipboard/Makefile.in | 2 +- samples/clipboard/clipboard.dsp | 16 ++++---- samples/clipboard/clipboard_vc7.vcproj | 8 ++-- samples/clipboard/clipboard_vc8.vcproj | 8 ++-- samples/clipboard/clipboard_vc9.vcproj | 8 ++-- samples/collpane/Makefile.in | 2 +- samples/collpane/collpane.dsp | 16 ++++---- samples/collpane/collpane_vc7.vcproj | 8 ++-- samples/collpane/collpane_vc8.vcproj | 8 ++-- samples/collpane/collpane_vc9.vcproj | 8 ++-- samples/combo/Makefile.in | 2 +- samples/combo/combo.dsp | 16 ++++---- samples/combo/combo_vc7.vcproj | 8 ++-- samples/combo/combo_vc8.vcproj | 8 ++-- samples/combo/combo_vc9.vcproj | 8 ++-- samples/config/Makefile.in | 2 +- samples/config/config.dsp | 16 ++++---- samples/config/config_vc7.vcproj | 8 ++-- samples/config/config_vc8.vcproj | 8 ++-- samples/config/config_vc9.vcproj | 8 ++-- samples/console/Makefile.in | 2 +- samples/console/console.dsp | 16 ++++---- samples/console/console_vc7.vcproj | 8 ++-- samples/console/console_vc8.vcproj | 8 ++-- samples/console/console_vc9.vcproj | 8 ++-- samples/controls/Makefile.in | 2 +- samples/controls/controls.dsp | 16 ++++---- samples/controls/controls_vc7.vcproj | 8 ++-- samples/controls/controls_vc8.vcproj | 8 ++-- samples/controls/controls_vc9.vcproj | 8 ++-- samples/dataview/Makefile.in | 2 +- samples/dataview/dataview.dsp | 16 ++++---- samples/dataview/dataview_vc7.vcproj | 8 ++-- samples/dataview/dataview_vc8.vcproj | 8 ++-- samples/dataview/dataview_vc9.vcproj | 8 ++-- samples/debugrpt/Makefile.in | 2 +- samples/debugrpt/debugrpt.dsp | 16 ++++---- samples/debugrpt/debugrpt_vc7.vcproj | 8 ++-- samples/debugrpt/debugrpt_vc8.vcproj | 8 ++-- samples/debugrpt/debugrpt_vc9.vcproj | 8 ++-- samples/dialogs/Makefile.in | 2 +- samples/dialogs/dialogs.dsp | 16 ++++---- samples/dialogs/dialogs_vc7.vcproj | 8 ++-- samples/dialogs/dialogs_vc8.vcproj | 8 ++-- samples/dialogs/dialogs_vc9.vcproj | 8 ++-- samples/dialup/Makefile.in | 2 +- samples/dialup/dialup.dsp | 16 ++++---- samples/dialup/dialup_vc7.vcproj | 8 ++-- samples/dialup/dialup_vc8.vcproj | 8 ++-- samples/dialup/dialup_vc9.vcproj | 8 ++-- samples/display/Makefile.in | 2 +- samples/display/display.dsp | 16 ++++---- samples/display/display_vc7.vcproj | 8 ++-- samples/display/display_vc8.vcproj | 8 ++-- samples/display/display_vc9.vcproj | 8 ++-- samples/dll/Makefile.in | 2 +- samples/dll/dll_my_dll.dsp | 16 ++++---- samples/dll/dll_vc7_my_dll.vcproj | 8 ++-- samples/dll/dll_vc7_wx_exe.vcproj | 4 +- samples/dll/dll_vc8_my_dll.vcproj | 8 ++-- samples/dll/dll_vc8_wx_exe.vcproj | 4 +- samples/dll/dll_vc9_my_dll.vcproj | 8 ++-- samples/dll/dll_vc9_wx_exe.vcproj | 4 +- samples/dll/dll_wx_exe.dsp | 8 ++-- samples/dnd/Makefile.in | 2 +- samples/dnd/dnd.dsp | 16 ++++---- samples/dnd/dnd_vc7.vcproj | 8 ++-- samples/dnd/dnd_vc8.vcproj | 8 ++-- samples/dnd/dnd_vc9.vcproj | 8 ++-- samples/docview/Info.plist | 10 ++--- samples/docview/Makefile.in | 2 +- samples/docview/docview.dsp | 16 ++++---- samples/docview/docview_vc7.vcproj | 8 ++-- samples/docview/docview_vc8.vcproj | 8 ++-- samples/docview/docview_vc9.vcproj | 8 ++-- samples/dragimag/Makefile.in | 2 +- samples/dragimag/dragimag.dsp | 16 ++++---- samples/dragimag/dragimag_vc7.vcproj | 8 ++-- samples/dragimag/dragimag_vc8.vcproj | 8 ++-- samples/dragimag/dragimag_vc9.vcproj | 8 ++-- samples/drawing/Makefile.in | 2 +- samples/drawing/drawing.dsp | 16 ++++---- samples/drawing/drawing_vc7.vcproj | 8 ++-- samples/drawing/drawing_vc8.vcproj | 8 ++-- samples/drawing/drawing_vc9.vcproj | 8 ++-- samples/erase/Makefile.in | 2 +- samples/erase/erase.dsp | 16 ++++---- samples/erase/erase_vc7.vcproj | 8 ++-- samples/erase/erase_vc8.vcproj | 8 ++-- samples/erase/erase_vc9.vcproj | 8 ++-- samples/event/Makefile.in | 2 +- samples/event/event.dsp | 16 ++++---- samples/event/event_vc7.vcproj | 8 ++-- samples/event/event_vc8.vcproj | 8 ++-- samples/event/event_vc9.vcproj | 8 ++-- samples/except/Makefile.in | 2 +- samples/except/except.dsp | 16 ++++---- samples/except/except_vc7.vcproj | 8 ++-- samples/except/except_vc8.vcproj | 8 ++-- samples/except/except_vc9.vcproj | 8 ++-- samples/exec/Makefile.in | 2 +- samples/exec/exec.dsp | 16 ++++---- samples/exec/exec_vc7.vcproj | 8 ++-- samples/exec/exec_vc8.vcproj | 8 ++-- samples/exec/exec_vc9.vcproj | 8 ++-- samples/flash/flash.dsp | 16 ++++---- samples/flash/flash_vc7.vcproj | 8 ++-- samples/flash/flash_vc8.vcproj | 8 ++-- samples/flash/flash_vc9.vcproj | 8 ++-- samples/font/Makefile.in | 2 +- samples/font/font.dsp | 16 ++++---- samples/font/font_vc7.vcproj | 8 ++-- samples/font/font_vc8.vcproj | 8 ++-- samples/font/font_vc9.vcproj | 8 ++-- samples/fswatcher/Makefile.in | 2 +- samples/fswatcher/fswatcher.dsp | 16 ++++---- samples/fswatcher/fswatcher_vc7.vcproj | 8 ++-- samples/fswatcher/fswatcher_vc8.vcproj | 8 ++-- samples/fswatcher/fswatcher_vc9.vcproj | 8 ++-- samples/grid/Makefile.in | 2 +- samples/grid/grid.dsp | 16 ++++---- samples/grid/grid_vc7.vcproj | 8 ++-- samples/grid/grid_vc8.vcproj | 8 ++-- samples/grid/grid_vc9.vcproj | 8 ++-- samples/help/Makefile.in | 2 +- samples/help/help.dsp | 16 ++++---- samples/help/help_vc7.vcproj | 8 ++-- samples/help/help_vc8.vcproj | 8 ++-- samples/help/help_vc9.vcproj | 8 ++-- samples/htlbox/Makefile.in | 2 +- samples/htlbox/htlbox.dsp | 16 ++++---- samples/htlbox/htlbox_vc7.vcproj | 8 ++-- samples/htlbox/htlbox_vc8.vcproj | 8 ++-- samples/htlbox/htlbox_vc9.vcproj | 8 ++-- samples/html/about/Makefile.in | 2 +- samples/html/about/about.dsp | 16 ++++---- samples/html/about/about_vc7.vcproj | 8 ++-- samples/html/about/about_vc8.vcproj | 8 ++-- samples/html/about/about_vc9.vcproj | 8 ++-- samples/html/help/Makefile.in | 2 +- samples/html/help/help.dsp | 16 ++++---- samples/html/help/help_vc7.vcproj | 8 ++-- samples/html/help/help_vc8.vcproj | 8 ++-- samples/html/help/help_vc9.vcproj | 8 ++-- samples/html/helpview/Makefile.in | 2 +- samples/html/helpview/helpview.dsp | 16 ++++---- samples/html/helpview/helpview_vc7.vcproj | 8 ++-- samples/html/helpview/helpview_vc8.vcproj | 8 ++-- samples/html/helpview/helpview_vc9.vcproj | 8 ++-- samples/html/htmlctrl/Makefile.in | 2 +- samples/html/printing/Makefile.in | 2 +- samples/html/printing/printing.dsp | 16 ++++---- samples/html/printing/printing_vc7.vcproj | 8 ++-- samples/html/printing/printing_vc8.vcproj | 8 ++-- samples/html/printing/printing_vc9.vcproj | 8 ++-- samples/html/test/Makefile.in | 2 +- samples/html/test/test.dsp | 16 ++++---- samples/html/test/test_vc7.vcproj | 8 ++-- samples/html/test/test_vc8.vcproj | 8 ++-- samples/html/test/test_vc9.vcproj | 8 ++-- samples/html/virtual/Makefile.in | 2 +- samples/html/virtual/virtual.dsp | 16 ++++---- samples/html/virtual/virtual_vc7.vcproj | 8 ++-- samples/html/virtual/virtual_vc8.vcproj | 8 ++-- samples/html/virtual/virtual_vc9.vcproj | 8 ++-- samples/html/widget/Makefile.in | 2 +- samples/html/widget/widget.dsp | 16 ++++---- samples/html/widget/widget_vc7.vcproj | 8 ++-- samples/html/widget/widget_vc8.vcproj | 8 ++-- samples/html/widget/widget_vc9.vcproj | 8 ++-- samples/html/zip/Makefile.in | 2 +- samples/html/zip/zip.dsp | 16 ++++---- samples/html/zip/zip_vc7.vcproj | 8 ++-- samples/html/zip/zip_vc8.vcproj | 8 ++-- samples/html/zip/zip_vc9.vcproj | 8 ++-- samples/image/Makefile.in | 2 +- samples/image/image.dsp | 16 ++++---- samples/image/image_vc7.vcproj | 8 ++-- samples/image/image_vc8.vcproj | 8 ++-- samples/image/image_vc9.vcproj | 8 ++-- samples/internat/Makefile.in | 2 +- samples/internat/internat.dsp | 16 ++++---- samples/internat/internat_vc7.vcproj | 8 ++-- samples/internat/internat_vc8.vcproj | 8 ++-- samples/internat/internat_vc9.vcproj | 8 ++-- samples/ipc/Makefile.in | 2 +- samples/ipc/ipc_baseipcclient.dsp | 16 ++++---- samples/ipc/ipc_baseipcserver.dsp | 16 ++++---- samples/ipc/ipc_ipcclient.dsp | 16 ++++---- samples/ipc/ipc_ipcserver.dsp | 16 ++++---- samples/ipc/ipc_vc7_baseipcclient.vcproj | 8 ++-- samples/ipc/ipc_vc7_baseipcserver.vcproj | 8 ++-- samples/ipc/ipc_vc7_ipcclient.vcproj | 8 ++-- samples/ipc/ipc_vc7_ipcserver.vcproj | 8 ++-- samples/ipc/ipc_vc8_baseipcclient.vcproj | 8 ++-- samples/ipc/ipc_vc8_baseipcserver.vcproj | 8 ++-- samples/ipc/ipc_vc8_ipcclient.vcproj | 8 ++-- samples/ipc/ipc_vc8_ipcserver.vcproj | 8 ++-- samples/ipc/ipc_vc9_baseipcclient.vcproj | 8 ++-- samples/ipc/ipc_vc9_baseipcserver.vcproj | 8 ++-- samples/ipc/ipc_vc9_ipcclient.vcproj | 8 ++-- samples/ipc/ipc_vc9_ipcserver.vcproj | 8 ++-- samples/joytest/Makefile.in | 2 +- samples/joytest/joytest.dsp | 16 ++++---- samples/joytest/joytest_vc7.vcproj | 8 ++-- samples/joytest/joytest_vc8.vcproj | 8 ++-- samples/joytest/joytest_vc9.vcproj | 8 ++-- samples/keyboard/Makefile.in | 2 +- samples/keyboard/keyboard.dsp | 16 ++++---- samples/keyboard/keyboard_vc7.vcproj | 8 ++-- samples/keyboard/keyboard_vc8.vcproj | 8 ++-- samples/keyboard/keyboard_vc9.vcproj | 8 ++-- samples/layout/Makefile.in | 2 +- samples/layout/layout.dsp | 16 ++++---- samples/layout/layout_vc7.vcproj | 8 ++-- samples/layout/layout_vc8.vcproj | 8 ++-- samples/layout/layout_vc9.vcproj | 8 ++-- samples/listctrl/Makefile.in | 2 +- samples/listctrl/listctrl.dsp | 16 ++++---- samples/listctrl/listctrl_vc7.vcproj | 8 ++-- samples/listctrl/listctrl_vc8.vcproj | 8 ++-- samples/listctrl/listctrl_vc9.vcproj | 8 ++-- samples/mdi/Makefile.in | 2 +- samples/mdi/mdi.dsp | 16 ++++---- samples/mdi/mdi_vc7.vcproj | 8 ++-- samples/mdi/mdi_vc8.vcproj | 8 ++-- samples/mdi/mdi_vc9.vcproj | 8 ++-- samples/mediaplayer/Makefile.in | 2 +- samples/mediaplayer/mediaplayer.dsp | 16 ++++---- samples/mediaplayer/mediaplayer_vc7.vcproj | 8 ++-- samples/mediaplayer/mediaplayer_vc8.vcproj | 8 ++-- samples/mediaplayer/mediaplayer_vc9.vcproj | 8 ++-- samples/memcheck/Makefile.in | 2 +- samples/memcheck/memcheck.dsp | 16 ++++---- samples/memcheck/memcheck_vc7.vcproj | 8 ++-- samples/memcheck/memcheck_vc8.vcproj | 8 ++-- samples/memcheck/memcheck_vc9.vcproj | 8 ++-- samples/menu/Makefile.in | 2 +- samples/menu/menu.dsp | 16 ++++---- samples/menu/menu_vc7.vcproj | 8 ++-- samples/menu/menu_vc8.vcproj | 8 ++-- samples/menu/menu_vc9.vcproj | 8 ++-- samples/mfc/mfc.dsp | 16 ++++---- samples/mfc/mfc_vc7.vcproj | 8 ++-- samples/mfc/mfc_vc8.vcproj | 8 ++-- samples/mfc/mfc_vc9.vcproj | 8 ++-- samples/minimal/Info_carbon.plist | 8 ++-- samples/minimal/Info_cocoa.plist | 8 ++-- samples/minimal/Makefile.in | 2 +- samples/minimal/borland_ide.cpp | 18 ++++----- samples/minimal/minimal.dsp | 16 ++++---- samples/minimal/minimal_vc7.vcproj | 8 ++-- samples/minimal/minimal_vc8.vcproj | 8 ++-- samples/minimal/minimal_vc9.vcproj | 8 ++-- samples/nativdlg/Makefile.in | 2 +- samples/nativdlg/nativdlg.dsp | 16 ++++---- samples/nativdlg/nativdlg_vc7.vcproj | 8 ++-- samples/nativdlg/nativdlg_vc8.vcproj | 8 ++-- samples/nativdlg/nativdlg_vc9.vcproj | 8 ++-- samples/notebook/Makefile.in | 2 +- samples/notebook/notebook.dsp | 16 ++++---- samples/notebook/notebook_vc7.vcproj | 8 ++-- samples/notebook/notebook_vc8.vcproj | 8 ++-- samples/notebook/notebook_vc9.vcproj | 8 ++-- samples/oleauto/Makefile.in | 2 +- samples/oleauto/oleauto.dsp | 16 ++++---- samples/oleauto/oleauto_vc7.vcproj | 8 ++-- samples/oleauto/oleauto_vc8.vcproj | 8 ++-- samples/oleauto/oleauto_vc9.vcproj | 8 ++-- samples/opengl/cube/Makefile.in | 2 +- samples/opengl/cube/cube.dsp | 16 ++++---- samples/opengl/cube/cube_vc7.vcproj | 8 ++-- samples/opengl/cube/cube_vc8.vcproj | 8 ++-- samples/opengl/cube/cube_vc9.vcproj | 8 ++-- samples/opengl/isosurf/Makefile.in | 2 +- samples/opengl/isosurf/isosurf.dsp | 16 ++++---- samples/opengl/isosurf/isosurf_vc7.vcproj | 8 ++-- samples/opengl/isosurf/isosurf_vc8.vcproj | 8 ++-- samples/opengl/isosurf/isosurf_vc9.vcproj | 8 ++-- samples/opengl/penguin/Makefile.in | 2 +- samples/opengl/penguin/penguin.dsp | 16 ++++---- samples/opengl/penguin/penguin_vc7.vcproj | 8 ++-- samples/opengl/penguin/penguin_vc8.vcproj | 8 ++-- samples/opengl/penguin/penguin_vc9.vcproj | 8 ++-- samples/ownerdrw/Makefile.in | 2 +- samples/ownerdrw/ownerdrw.dsp | 16 ++++---- samples/ownerdrw/ownerdrw_vc7.vcproj | 8 ++-- samples/ownerdrw/ownerdrw_vc8.vcproj | 8 ++-- samples/ownerdrw/ownerdrw_vc9.vcproj | 8 ++-- samples/popup/Makefile.in | 2 +- samples/popup/popup.dsp | 16 ++++---- samples/popup/popup_vc7.vcproj | 8 ++-- samples/popup/popup_vc8.vcproj | 8 ++-- samples/popup/popup_vc9.vcproj | 8 ++-- samples/power/Makefile.in | 2 +- samples/power/power.dsp | 16 ++++---- samples/power/power_vc7.vcproj | 8 ++-- samples/power/power_vc8.vcproj | 8 ++-- samples/power/power_vc9.vcproj | 8 ++-- samples/preferences/Makefile.in | 2 +- samples/preferences/preferences.dsp | 16 ++++---- samples/preferences/preferences_vc7.vcproj | 8 ++-- samples/preferences/preferences_vc8.vcproj | 8 ++-- samples/preferences/preferences_vc9.vcproj | 8 ++-- samples/printing/Makefile.in | 2 +- samples/printing/printing.dsp | 16 ++++---- samples/printing/printing_vc7.vcproj | 8 ++-- samples/printing/printing_vc8.vcproj | 8 ++-- samples/printing/printing_vc9.vcproj | 8 ++-- samples/propgrid/Makefile.in | 2 +- samples/propgrid/propgrid.dsp | 16 ++++---- samples/propgrid/propgrid_vc7.vcproj | 8 ++-- samples/propgrid/propgrid_vc8.vcproj | 8 ++-- samples/propgrid/propgrid_vc9.vcproj | 8 ++-- samples/regtest/Makefile.in | 2 +- samples/regtest/regtest.dsp | 16 ++++---- samples/regtest/regtest_vc7.vcproj | 8 ++-- samples/regtest/regtest_vc8.vcproj | 8 ++-- samples/regtest/regtest_vc9.vcproj | 8 ++-- samples/render/Makefile.in | 9 +++-- samples/render/render_renddll.dsp | 16 ++++---- samples/render/render_render.dsp | 16 ++++---- samples/render/render_vc7_renddll.vcproj | 16 ++++---- samples/render/render_vc7_render.vcproj | 8 ++-- samples/render/render_vc8_renddll.vcproj | 16 ++++---- samples/render/render_vc8_render.vcproj | 8 ++-- samples/render/render_vc9_renddll.vcproj | 16 ++++---- samples/render/render_vc9_render.vcproj | 8 ++-- samples/ribbon/Makefile.in | 2 +- samples/ribbon/ribbon.dsp | 16 ++++---- samples/ribbon/ribbon_vc7.vcproj | 8 ++-- samples/ribbon/ribbon_vc8.vcproj | 8 ++-- samples/ribbon/ribbon_vc9.vcproj | 8 ++-- samples/richtext/Makefile.in | 2 +- samples/richtext/richtext.dsp | 16 ++++---- samples/richtext/richtext_vc7.vcproj | 8 ++-- samples/richtext/richtext_vc8.vcproj | 8 ++-- samples/richtext/richtext_vc9.vcproj | 8 ++-- samples/sashtest/Makefile.in | 2 +- samples/sashtest/sashtest.dsp | 16 ++++---- samples/sashtest/sashtest_vc7.vcproj | 8 ++-- samples/sashtest/sashtest_vc8.vcproj | 8 ++-- samples/sashtest/sashtest_vc9.vcproj | 8 ++-- samples/scroll/Makefile.in | 2 +- samples/scroll/scroll.dsp | 16 ++++---- samples/scroll/scroll_vc7.vcproj | 8 ++-- samples/scroll/scroll_vc8.vcproj | 8 ++-- samples/scroll/scroll_vc9.vcproj | 8 ++-- samples/shaped/Makefile.in | 2 +- samples/shaped/shaped.dsp | 16 ++++---- samples/shaped/shaped_vc7.vcproj | 8 ++-- samples/shaped/shaped_vc8.vcproj | 8 ++-- samples/shaped/shaped_vc9.vcproj | 8 ++-- samples/sockets/Makefile.in | 2 +- samples/sockets/sockets_baseclient.dsp | 16 ++++---- samples/sockets/sockets_baseserver.dsp | 16 ++++---- samples/sockets/sockets_client.dsp | 16 ++++---- samples/sockets/sockets_server.dsp | 16 ++++---- samples/sockets/sockets_vc7_baseclient.vcproj | 8 ++-- samples/sockets/sockets_vc7_baseserver.vcproj | 8 ++-- samples/sockets/sockets_vc7_client.vcproj | 8 ++-- samples/sockets/sockets_vc7_server.vcproj | 8 ++-- samples/sockets/sockets_vc8_baseclient.vcproj | 8 ++-- samples/sockets/sockets_vc8_baseserver.vcproj | 8 ++-- samples/sockets/sockets_vc8_client.vcproj | 8 ++-- samples/sockets/sockets_vc8_server.vcproj | 8 ++-- samples/sockets/sockets_vc9_baseclient.vcproj | 8 ++-- samples/sockets/sockets_vc9_baseserver.vcproj | 8 ++-- samples/sockets/sockets_vc9_client.vcproj | 8 ++-- samples/sockets/sockets_vc9_server.vcproj | 8 ++-- samples/sound/Makefile.in | 2 +- samples/sound/sound.dsp | 16 ++++---- samples/sound/sound_vc7.vcproj | 8 ++-- samples/sound/sound_vc8.vcproj | 8 ++-- samples/sound/sound_vc9.vcproj | 8 ++-- samples/splash/Makefile.in | 2 +- samples/splash/splash.dsp | 16 ++++---- samples/splash/splash_vc7.vcproj | 8 ++-- samples/splash/splash_vc8.vcproj | 8 ++-- samples/splash/splash_vc9.vcproj | 8 ++-- samples/splitter/Makefile.in | 2 +- samples/splitter/splitter.dsp | 16 ++++---- samples/splitter/splitter_vc7.vcproj | 8 ++-- samples/splitter/splitter_vc8.vcproj | 8 ++-- samples/splitter/splitter_vc9.vcproj | 8 ++-- samples/statbar/Makefile.in | 2 +- samples/statbar/statbar.dsp | 16 ++++---- samples/statbar/statbar_vc7.vcproj | 8 ++-- samples/statbar/statbar_vc8.vcproj | 8 ++-- samples/statbar/statbar_vc9.vcproj | 8 ++-- samples/stc/Makefile.in | 2 +- samples/stc/stctest.dsp | 16 ++++---- samples/stc/stctest_vc7.vcproj | 8 ++-- samples/stc/stctest_vc8.vcproj | 8 ++-- samples/stc/stctest_vc9.vcproj | 8 ++-- samples/svg/Makefile.in | 2 +- samples/svg/svgtest.dsp | 16 ++++---- samples/svg/svgtest_vc7.vcproj | 8 ++-- samples/svg/svgtest_vc8.vcproj | 8 ++-- samples/svg/svgtest_vc9.vcproj | 8 ++-- samples/taborder/Makefile.in | 2 +- samples/taborder/taborder.dsp | 16 ++++---- samples/taborder/taborder_vc7.vcproj | 8 ++-- samples/taborder/taborder_vc8.vcproj | 8 ++-- samples/taborder/taborder_vc9.vcproj | 8 ++-- samples/taskbar/Makefile.in | 2 +- samples/taskbar/taskbar.dsp | 16 ++++---- samples/taskbar/taskbar_vc7.vcproj | 8 ++-- samples/taskbar/taskbar_vc8.vcproj | 8 ++-- samples/taskbar/taskbar_vc9.vcproj | 8 ++-- samples/text/Makefile.in | 2 +- samples/text/text.dsp | 16 ++++---- samples/text/text_vc7.vcproj | 8 ++-- samples/text/text_vc8.vcproj | 8 ++-- samples/text/text_vc9.vcproj | 8 ++-- samples/thread/Makefile.in | 2 +- samples/thread/thread.dsp | 16 ++++---- samples/thread/thread_vc7.vcproj | 8 ++-- samples/thread/thread_vc8.vcproj | 8 ++-- samples/thread/thread_vc9.vcproj | 8 ++-- samples/toolbar/Makefile.in | 2 +- samples/toolbar/toolbar.dsp | 16 ++++---- samples/toolbar/toolbar_vc7.vcproj | 8 ++-- samples/toolbar/toolbar_vc8.vcproj | 8 ++-- samples/toolbar/toolbar_vc9.vcproj | 8 ++-- samples/treectrl/Makefile.in | 2 +- samples/treectrl/treectrl.dsp | 16 ++++---- samples/treectrl/treectrl_vc7.vcproj | 8 ++-- samples/treectrl/treectrl_vc8.vcproj | 8 ++-- samples/treectrl/treectrl_vc9.vcproj | 8 ++-- samples/treelist/Makefile.in | 2 +- samples/treelist/treelist.dsp | 16 ++++---- samples/treelist/treelist_vc7.vcproj | 8 ++-- samples/treelist/treelist_vc8.vcproj | 8 ++-- samples/treelist/treelist_vc9.vcproj | 8 ++-- samples/typetest/Makefile.in | 2 +- samples/typetest/typetest.dsp | 16 ++++---- samples/typetest/typetest_vc7.vcproj | 8 ++-- samples/typetest/typetest_vc8.vcproj | 8 ++-- samples/typetest/typetest_vc9.vcproj | 8 ++-- samples/uiaction/Makefile.in | 2 +- samples/uiaction/uiaction.dsp | 16 ++++---- samples/uiaction/uiaction_vc7.vcproj | 8 ++-- samples/uiaction/uiaction_vc8.vcproj | 8 ++-- samples/uiaction/uiaction_vc9.vcproj | 8 ++-- samples/validate/Makefile.in | 2 +- samples/validate/validate.dsp | 16 ++++---- samples/validate/validate_vc7.vcproj | 8 ++-- samples/validate/validate_vc8.vcproj | 8 ++-- samples/validate/validate_vc9.vcproj | 8 ++-- samples/vscroll/Makefile.in | 2 +- samples/vscroll/vscroll.dsp | 16 ++++---- samples/vscroll/vscroll_vc7.vcproj | 8 ++-- samples/vscroll/vscroll_vc8.vcproj | 8 ++-- samples/vscroll/vscroll_vc9.vcproj | 8 ++-- samples/webview/Makefile.in | 2 +- samples/webview/webview.dsp | 16 ++++---- samples/webview/webview_vc7.vcproj | 8 ++-- samples/webview/webview_vc8.vcproj | 8 ++-- samples/webview/webview_vc9.vcproj | 8 ++-- samples/widgets/Makefile.in | 2 +- samples/widgets/widgets.dsp | 16 ++++---- samples/widgets/widgets_vc7.vcproj | 8 ++-- samples/widgets/widgets_vc8.vcproj | 8 ++-- samples/widgets/widgets_vc9.vcproj | 8 ++-- samples/wizard/Makefile.in | 2 +- samples/wizard/wizard.dsp | 16 ++++---- samples/wizard/wizard_vc7.vcproj | 8 ++-- samples/wizard/wizard_vc8.vcproj | 8 ++-- samples/wizard/wizard_vc9.vcproj | 8 ++-- samples/wrapsizer/Makefile.in | 2 +- samples/wrapsizer/wrapsizer.dsp | 16 ++++---- samples/wrapsizer/wrapsizer_vc7.vcproj | 8 ++-- samples/wrapsizer/wrapsizer_vc8.vcproj | 8 ++-- samples/wrapsizer/wrapsizer_vc9.vcproj | 8 ++-- samples/xrc/Makefile.in | 2 +- samples/xrc/xrcdemo.dsp | 16 ++++---- samples/xrc/xrcdemo_vc7.vcproj | 8 ++-- samples/xrc/xrcdemo_vc8.vcproj | 8 ++-- samples/xrc/xrcdemo_vc9.vcproj | 8 ++-- samples/xti/Makefile.in | 2 +- samples/xti/xti.dsp | 16 ++++---- samples/xti/xti_vc7.vcproj | 8 ++-- samples/xti/xti_vc8.vcproj | 8 ++-- samples/xti/xti_vc9.vcproj | 8 ++-- tests/Makefile.in | 2 +- tests/benchmarks/Makefile.in | 2 +- tests/test_test.dsp | 16 ++++---- tests/test_test_gui.dsp | 16 ++++---- tests/test_vc7_test.vcproj | 8 ++-- tests/test_vc7_test_gui.vcproj | 8 ++-- tests/test_vc8_test.vcproj | 8 ++-- tests/test_vc8_test_gui.vcproj | 8 ++-- tests/test_vc9_test.vcproj | 8 ++-- tests/test_vc9_test_gui.vcproj | 8 ++-- utils/emulator/src/Makefile.in | 2 +- utils/emulator/src/emulator.dsp | 16 ++++---- utils/emulator/src/emulator_vc7.vcproj | 8 ++-- utils/emulator/src/emulator_vc8.vcproj | 8 ++-- utils/emulator/src/emulator_vc9.vcproj | 8 ++-- utils/execmon/Makefile.in | 2 +- utils/execmon/execmon.dsp | 16 ++++---- utils/helpview/src/Makefile.in | 2 +- utils/helpview/src/helpview.dsp | 16 ++++---- utils/helpview/src/helpview_vc7.vcproj | 8 ++-- utils/helpview/src/helpview_vc8.vcproj | 8 ++-- utils/helpview/src/helpview_vc9.vcproj | 8 ++-- utils/hhp2cached/Makefile.in | 2 +- utils/hhp2cached/hhp2cached.dsp | 16 ++++---- utils/hhp2cached/hhp2cached_vc7.vcproj | 8 ++-- utils/hhp2cached/hhp2cached_vc8.vcproj | 8 ++-- utils/hhp2cached/hhp2cached_vc9.vcproj | 8 ++-- utils/ifacecheck/src/Makefile.in | 2 +- utils/ifacecheck/src/ifacecheck.dsp | 16 ++++---- utils/screenshotgen/src/Makefile.in | 2 +- utils/screenshotgen/src/screenshotgen.dsp | 16 ++++---- utils/wxrc/Makefile.in | 2 +- utils/wxrc/wxrc.dsp | 16 ++++---- utils/wxrc/wxrc_vc7.vcproj | 8 ++-- utils/wxrc/wxrc_vc8.vcproj | 8 ++-- utils/wxrc/wxrc_vc9.vcproj | 8 ++-- 605 files changed, 2827 insertions(+), 2841 deletions(-) diff --git a/Makefile.in b/Makefile.in index f38bb22b20..7ea4b6ea03 100644 --- a/Makefile.in +++ b/Makefile.in @@ -74,9 +74,10 @@ wx_top_builddir = @wx_top_builddir@ ### Variables: ### DESTDIR = -WX_RELEASE = 3.0 -WX_RELEASE_NODOT = 30 +WX_RELEASE = 3.1 +WX_RELEASE_NODOT = 31 WX_VERSION = $(WX_RELEASE).0 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ $(CPPFLAGS) $(CFLAGS) @@ -2100,10 +2101,10 @@ LOCALE_MSW_LINGUAS = it @COND_WXUNIV_1@WXUNIVNAME = univ @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = \ -@COND_PLATFORM_WIN32_1@ wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT) +@COND_PLATFORM_WIN32_1@ wxbase$(WXBASEPORT)$(WX_VERSION_NODOT) @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \ -@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT) +@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT) @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE) @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = COND_wxUSE_REGEX_builtin___wxregex___depname = \ @@ -2165,8 +2166,8 @@ COND_USE_STC_1___wxscintilla___depname = \ @COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = -@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = $(WX_RELEASE_NODOT) -@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_RELEASE) +@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = $(WX_VERSION_NODOT) +@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION) @COND_PLATFORM_UNIX_0@PLUGVERDELIM = @COND_PLATFORM_UNIX_1@PLUGVERDELIM = - @COND_TOOLKIT_WINCE@BASE_WINCE_SRC = src/msw/wince/time.cpp diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl index ea19a224cd..a56c27bcd1 100644 --- a/build/bakefiles/wxpresets/presets/wx.bkl +++ b/build/bakefiles/wxpresets/presets/wx.bkl @@ -227,7 +227,7 @@ - 30 + 31