Merge branch 'master' into webview-chromium

This commit is contained in:
Vadim Zeitlin 2023-11-30 18:30:26 +01:00
commit e90817930a
1650 changed files with 15891 additions and 13384 deletions

View file

@ -6,6 +6,15 @@
# future git-blame invocations, run the following command:
#
# git config blame.ignoreRevsFile .git-blame-ignore-revs
#
# When adding entries to this file, please keep them in reverse chronological
# order (the newest ones are added at the top).
#
# You can use
#
# $ git show -s --format='# %s, %cs%n%H%n'
#
# incantation to directly create an entry in the format used here.
# Get rid of obsoleted comments, 2023-02-05
2df05fb915516e0563578e34aec45980be51b1f4
@ -16,12 +25,18 @@ e43190ea796ac3c1d15c18a88bcf7f3f745bd4bc
# Get rid of commented out code, 2022-10-26
db31a0161503c6ea4cc461f4e10b67830b7d6b52
# Use nullptr instead of NULL in the code and documentation, 2022-10-18
4f4c5fcfdfe7d1eadce22a68929c82b6cb324075
# Fix comment typos in sources, 2021-10-02
668a2186cd89fd4576bed224df3624811eebeca1
# Remove all trailing spaces, 2019-01-30
8fbca5cb70c8b647d5bd2cacb1e0a2a00358f351
# Remove more wxT() macros from samples, 2018-09-29
b70ed2d8c84cadf10bd42fc052a255fac02391e4
# Remove (most) occurrences of wxT() macro from the samples, 2018-09-23
f58ea625968953ca93585ea7f93dcc07ad032d8f
@ -31,7 +46,7 @@ f58ea625968953ca93585ea7f93dcc07ad032d8f
# Remove all lines containing cvs/svn "$Id$" keyword.
3f66f6a5b3583b02c34854556eb83e3a808524ce
# No changes, just removed hard tabs and trailing white space., 2009-08-21)
# No changes, just removed hard tabs and trailing white space., 2009-08-21
03647350fc7cd141953c72e0284e928847d30f44
# Globally replace _T() with wxT()., 2009-07-23

View file

@ -11,29 +11,49 @@ assignees: ''
IMPORTANT NOTE
--------------
Please note that this entry field uses [Markdown][1], which means that you
need to escape any code snippets pasted here using fenced code blocks,
i.e. by putting ``` before and after it. Also escape, using
backslash, i.e. `\<` any angle brackets to prevent them from being
interpreted as HTML tags.
Please note that this entry field uses Markdown, see
Use the Preview tab to review your issue before submitting it to verify that
your formatting is correct.
https://docs.github.com/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
[1]: https://docs.github.com/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax
if you're unfamiliar with it, and make sure to use the "Preview" tab just above
to review your issue before submitting it to verify that your formatting is
correct.
---
In particular, please use code blocks, i.e. put ``` on a separate line before
and after any block of code or long text (such as compiler or make output).
Also make sure to escape, using backslash, i.e. `\<`, any angle brackets
to prevent them from being interpreted as HTML tags.
Finally, feel free to remove the explanatory comments, including this one,
after reading (and hopefully following) them.
-->
### Description
<!--
Please use the following sections in your report:
#### Bug description:
Describe the bug:
A clear and concise description of what the bug is.
Expected vs observed behaviour:
#### Expected vs observed behaviour:
Please describe what you expected to happen and what actually happens. Make
sure to explain what exactly is the problem, just attaching a screenshot is
not always sufficient. When in doubt, please provide more details rather
than too few.
Patch or snippet allowing to reproduce the problem:
#### Stack trace:
If relevant, i.e. if the problem is a crash or an assert failure, please run
the program under debugger and copy and paste here (as text, not as an image:
you can use Ctrl+C in MSVS "Stack" window) the stack shown when you break into
the debugger once the problem happens.
#### Patch or snippet allowing to reproduce the problem:
Please attach the smallest possible patch allowing to reproduce the problem
in a sample. If there is absolutely no appropriate sample, please attach a
minimal self-contained example in a single file.
@ -41,7 +61,8 @@ minimal self-contained example in a single file.
Skip this step if the problem can be reproduced in one of the samples
without any changes.
To Reproduce:
#### To Reproduce:
Steps to reproduce the behaviour, please make them as detailed as possible.
For example:
@ -51,17 +72,14 @@ For example:
4. See error
-->
### Description
<!-- Describe the bug here -->
### Platform and version information
- wxWidgets version <!-- [e.g. 3.2.1] --> you use:
- wxWidgets port <!-- [e.g. wxMSW, wxGTK, wxOSX] --> you use:
- OS <!-- [e.g. Windows 10, Ubuntu 22.10, macOS 15] --> and its version:
<!-- For wxGTK only (**remove** this section if not using wxGTK) -->
+ GTK version: <!-- [e.g. 3.24.5] -->
+ Which GDK <!-- [X11 or Wayland] --> backend is used:
+ Current theme: <!-- (If relevant, i.e. for appearance-related problems) -->
<!-- For wxGTK only (**remove** this section if not using wxGTK) -->
+ GTK version: <!-- [e.g. 3.24.5] -->
+ Which GDK <!-- [X11 or Wayland] --> backend is used:
+ Desktop environment <!-- [e.g. Gnome or KDE] -->:
+ Current theme: <!-- (If relevant, i.e. for appearance-related problems) -->

View file

@ -6,13 +6,31 @@ labels: 'build'
assignees: ''
---
### Build System Used
<!--
Please describe exactly how you build wxWidgets, including the full `configure`
command line and/or `make` command line if relevant.
Please select the tool you use for building, i.e. check exactly
one line from those below by putting "x" in between the brackets.
-->
Please attach the full build log, but feel free to quote the relevant parts of
it here.
I build wxWidgets and/or my application using:
- [ ] CMake
- [ ] configure
- [ ] mingw32-make with makefile.gcc
- [ ] MSBuild (Microsoft Visual Studio solution file)
- [ ] nmake with makefile.vc
- [ ] Xcode
<!--
For command line based tools, such as configure or CMake,
please include the full command line used to run them.
Please attach the full build log, but feel free to quote
the relevant parts of it here.
When using `configure`, please also attach `config.log` file.
@ -28,3 +46,4 @@ When using `configure`, please also attach `config.log` file.
- wxWidgets port <!-- [e.g. wxMSW, wxGTK, wxOSX] --> you are building:
- OS <!-- [e.g. Windows 10, Ubuntu 22.10, macOS 15] --> and its version:
- Compiler <!-- [e.g. MSVS 2022, gcc 12.1] --> being used:
- Non-default compiler options, if any <!-- e.g. -std=c++26 -->:

View file

@ -137,6 +137,7 @@ jobs:
container: ubuntu:18.04
configure_flags: --with-qt --enable-pch --without-opengl
skip_samples: true
use_xvfb: true
env:
wxGTK_VERSION: ${{ matrix.gtk_version && matrix.gtk_version || 3 }}
@ -343,6 +344,11 @@ jobs:
exit $rc
fi
- name: Testing launching GUI test
working-directory: tests
run: |
WX_TEST_DISABLE_GUI=1 ./test_gui
- name: Testing GUI using Xvfb
if: matrix.use_xvfb
working-directory: tests
@ -364,6 +370,9 @@ jobs:
wx_tests_selection='~[.] ~RichTextCtrlTestCase'
fi
# The tests only work reliably with native windows
export QT_USE_NATIVE_WINDOWS=1
# Configure the system to create core files and create them in the
# current directory instead of using apport to handle them, as
# Ubuntu does by default (even in a container where apport is not

View file

@ -93,7 +93,7 @@ jobs:
git fetch --depth=1 origin master
if git diff origin/master \
':**.h' ':**.cpp' \
| grep -E '^\+.*(wxOVERRIDE|wxNOEXCEPT|[^"_@A-Za-z0-9]NULL[^"_A-Za-z0-9])'; then
| grep -E '^\+.*(wxOVERRIDE|wxNOEXCEPT|[^"_@A-Za-z0-9]NULL([- ,;()+*/%&=!?]|$))'; then
echo "::error ::Please use C++11 equivalents of the deprecated macros in the new code."
exit 1
fi

View file

@ -3495,7 +3495,6 @@ COND_TOOLKIT_QT_GUI_HDR = \
wx/qt/msgdlg.h \
wx/qt/nonownedwnd.h \
wx/qt/notebook.h \
wx/qt/palette.h \
wx/qt/pen.h \
wx/qt/popupwin.h \
wx/qt/printdlg.h \
@ -3532,7 +3531,10 @@ COND_TOOLKIT_QT_GUI_HDR = \
wx/qt/dataview.h \
wx/qt/dvrenderers.h \
$(QT_PLATFORM_HDR) \
wx/qt/treectrl.h
wx/qt/treectrl.h \
wx/generic/paletteg.h \
wx/qt/datectrl.h \
wx/qt/timectrl.h
@COND_TOOLKIT_QT@GUI_HDR = $(COND_TOOLKIT_QT_GUI_HDR)
@COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR =
@COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR =
@ -5350,9 +5352,9 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_msw_bmpcbox.o \
monodll_msw_hyperlink.o \
monodll_msw_calctrl.o \
monodll_datectrl.o \
monodll_msw_datectrl.o \
monodll_msw_datetimectrl.o \
monodll_timectrl.o \
monodll_msw_timectrl.o \
monodll_datecontrols.o \
monodll_generic_activityindicator.o \
monodll_msw_imaglist.o \
@ -5415,7 +5417,8 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_cocoa_activityindicator.o \
monodll_cocoa_statbmp.o \
monodll_core_display.o
monodll_core_display.o \
monodll_cocoa_renderer.o
@COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS)
COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS = \
$(__OSX_COMMON_SRC_OBJECTS) \
@ -5505,7 +5508,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_qt_minifram.o \
monodll_qt_msgdlg.o \
monodll_qt_notebook.o \
monodll_qt_palette.o \
monodll_qt_nonownedwnd.o \
monodll_qt_pen.o \
monodll_qt_popupwin.o \
@ -5537,7 +5539,10 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \
monodll_qt_utils.o \
monodll_qt_window.o \
$(__QT_PLATFORM_SRC_OBJECTS) \
monodll_qt_treectrl.o
monodll_qt_treectrl.o \
monodll_paletteg.o \
monodll_qt_datectrl.o \
monodll_qt_timectrl.o
@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS)
@COND_PLATFORM_UNIX_1@__QT_PLATFORM_SRC_OBJECTS = \
@COND_PLATFORM_UNIX_1@ monodll_unix_dialup.o monodll_unix_joystick.o \
@ -7112,9 +7117,9 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_msw_bmpcbox.o \
monolib_msw_hyperlink.o \
monolib_msw_calctrl.o \
monolib_datectrl.o \
monolib_msw_datectrl.o \
monolib_msw_datetimectrl.o \
monolib_timectrl.o \
monolib_msw_timectrl.o \
monolib_datecontrols.o \
monolib_generic_activityindicator.o \
monolib_msw_imaglist.o \
@ -7177,7 +7182,8 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 = \
monolib_taskbarcmn.o \
monolib_cocoa_activityindicator.o \
monolib_cocoa_statbmp.o \
monolib_core_display.o
monolib_core_display.o \
monolib_cocoa_renderer.o
@COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 = \
$(__OSX_COMMON_SRC_OBJECTS_0) \
@ -7267,7 +7273,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_qt_minifram.o \
monolib_qt_msgdlg.o \
monolib_qt_notebook.o \
monolib_qt_palette.o \
monolib_qt_nonownedwnd.o \
monolib_qt_pen.o \
monolib_qt_popupwin.o \
@ -7299,7 +7304,10 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \
monolib_qt_utils.o \
monolib_qt_window.o \
$(__QT_PLATFORM_SRC_OBJECTS_1) \
monolib_qt_treectrl.o
monolib_qt_treectrl.o \
monolib_paletteg.o \
monolib_qt_datectrl.o \
monolib_qt_timectrl.o
@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1)
@COND_PLATFORM_UNIX_1@__QT_PLATFORM_SRC_OBJECTS_1 = \
@COND_PLATFORM_UNIX_1@ monolib_unix_dialup.o monolib_unix_joystick.o \
@ -9025,9 +9033,9 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_msw_bmpcbox.o \
coredll_msw_hyperlink.o \
coredll_msw_calctrl.o \
coredll_datectrl.o \
coredll_msw_datectrl.o \
coredll_msw_datetimectrl.o \
coredll_timectrl.o \
coredll_msw_timectrl.o \
coredll_datecontrols.o \
coredll_generic_activityindicator.o \
coredll_msw_imaglist.o \
@ -9090,7 +9098,8 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 = \
coredll_taskbarcmn.o \
coredll_cocoa_activityindicator.o \
coredll_cocoa_statbmp.o \
coredll_core_display.o
coredll_core_display.o \
coredll_cocoa_renderer.o
@COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 = \
$(__OSX_COMMON_SRC_OBJECTS_8) \
@ -9180,7 +9189,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_qt_minifram.o \
coredll_qt_msgdlg.o \
coredll_qt_notebook.o \
coredll_qt_palette.o \
coredll_qt_nonownedwnd.o \
coredll_qt_pen.o \
coredll_qt_popupwin.o \
@ -9212,7 +9220,10 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \
coredll_qt_utils.o \
coredll_qt_window.o \
$(__QT_PLATFORM_SRC_OBJECTS_2) \
coredll_qt_treectrl.o
coredll_qt_treectrl.o \
coredll_paletteg.o \
coredll_qt_datectrl.o \
coredll_qt_timectrl.o
@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2)
@COND_PLATFORM_UNIX_1@__QT_PLATFORM_SRC_OBJECTS_2 = \
@COND_PLATFORM_UNIX_1@ coredll_unix_dialup.o coredll_unix_joystick.o \
@ -10513,9 +10524,9 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_msw_bmpcbox.o \
corelib_msw_hyperlink.o \
corelib_msw_calctrl.o \
corelib_datectrl.o \
corelib_msw_datectrl.o \
corelib_msw_datetimectrl.o \
corelib_timectrl.o \
corelib_msw_timectrl.o \
corelib_datecontrols.o \
corelib_generic_activityindicator.o \
corelib_msw_imaglist.o \
@ -10578,7 +10589,8 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 = \
corelib_taskbarcmn.o \
corelib_cocoa_activityindicator.o \
corelib_cocoa_statbmp.o \
corelib_core_display.o
corelib_core_display.o \
corelib_cocoa_renderer.o
@COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 = \
$(__OSX_COMMON_SRC_OBJECTS_9) \
@ -10668,7 +10680,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_qt_minifram.o \
corelib_qt_msgdlg.o \
corelib_qt_notebook.o \
corelib_qt_palette.o \
corelib_qt_nonownedwnd.o \
corelib_qt_pen.o \
corelib_qt_popupwin.o \
@ -10700,7 +10711,10 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \
corelib_qt_utils.o \
corelib_qt_window.o \
$(__QT_PLATFORM_SRC_OBJECTS_3) \
corelib_qt_treectrl.o
corelib_qt_treectrl.o \
corelib_paletteg.o \
corelib_qt_datectrl.o \
corelib_qt_timectrl.o
@COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3)
@COND_PLATFORM_UNIX_1@__QT_PLATFORM_SRC_OBJECTS_3 = \
@COND_PLATFORM_UNIX_1@ corelib_unix_dialup.o corelib_unix_joystick.o \
@ -12254,7 +12268,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS = \
monodll_carbon_mdi.o \
monodll_carbon_metafile.o \
monodll_carbon_popupwin.o \
monodll_carbon_renderer.o \
monodll_statbrma.o \
monodll_carbon_region.o \
monodll_utilscocoa.o \
@ -12388,7 +12401,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0 = \
monolib_carbon_mdi.o \
monolib_carbon_metafile.o \
monolib_carbon_popupwin.o \
monolib_carbon_renderer.o \
monolib_statbrma.o \
monolib_carbon_region.o \
monolib_utilscocoa.o \
@ -12521,7 +12533,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \
coredll_carbon_mdi.o \
coredll_carbon_metafile.o \
coredll_carbon_popupwin.o \
coredll_carbon_renderer.o \
coredll_statbrma.o \
coredll_carbon_region.o \
coredll_utilscocoa.o \
@ -12654,7 +12665,6 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9 = \
corelib_carbon_mdi.o \
corelib_carbon_metafile.o \
corelib_carbon_popupwin.o \
corelib_carbon_renderer.o \
corelib_statbrma.o \
corelib_carbon_region.o \
corelib_utilscocoa.o \
@ -15313,13 +15323,13 @@ monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP)
monodll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
monodll_msw_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
monodll_msw_datetimectrl.o: $(srcdir)/src/msw/datetimectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datetimectrl.cpp
monodll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONODLL_ODEP)
monodll_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
@ -15490,6 +15500,9 @@ monodll_cocoa_statbmp.o: $(srcdir)/src/osx/cocoa/statbmp.mm $(MONODLL_ODEP)
monodll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
monodll_cocoa_renderer.o: $(srcdir)/src/osx/cocoa/renderer.mm $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/renderer.mm
monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
@ -15700,9 +15713,6 @@ monodll_qt_msgdlg.o: $(srcdir)/src/qt/msgdlg.cpp $(MONODLL_ODEP)
monodll_qt_notebook.o: $(srcdir)/src/qt/notebook.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/notebook.cpp
monodll_qt_palette.o: $(srcdir)/src/qt/palette.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/palette.cpp
monodll_qt_nonownedwnd.o: $(srcdir)/src/qt/nonownedwnd.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/nonownedwnd.cpp
@ -15799,6 +15809,12 @@ monodll_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(MONODLL_ODEP)
monodll_qt_treectrl.o: $(srcdir)/src/qt/treectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/treectrl.cpp
monodll_qt_datectrl.o: $(srcdir)/src/qt/datectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/datectrl.cpp
monodll_qt_timectrl.o: $(srcdir)/src/qt/timectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/timectrl.cpp
monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
@ -16954,6 +16970,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@ -18733,12 +18752,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
@ -20059,13 +20072,13 @@ monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP)
monolib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
monolib_msw_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
monolib_msw_datetimectrl.o: $(srcdir)/src/msw/datetimectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datetimectrl.cpp
monolib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONOLIB_ODEP)
monolib_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
@ -20236,6 +20249,9 @@ monolib_cocoa_statbmp.o: $(srcdir)/src/osx/cocoa/statbmp.mm $(MONOLIB_ODEP)
monolib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
monolib_cocoa_renderer.o: $(srcdir)/src/osx/cocoa/renderer.mm $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/renderer.mm
monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
@ -20446,9 +20462,6 @@ monolib_qt_msgdlg.o: $(srcdir)/src/qt/msgdlg.cpp $(MONOLIB_ODEP)
monolib_qt_notebook.o: $(srcdir)/src/qt/notebook.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/notebook.cpp
monolib_qt_palette.o: $(srcdir)/src/qt/palette.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/palette.cpp
monolib_qt_nonownedwnd.o: $(srcdir)/src/qt/nonownedwnd.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/nonownedwnd.cpp
@ -20545,6 +20558,12 @@ monolib_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(MONOLIB_ODEP)
monolib_qt_treectrl.o: $(srcdir)/src/qt/treectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/treectrl.cpp
monolib_qt_datectrl.o: $(srcdir)/src/qt/datectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/datectrl.cpp
monolib_qt_timectrl.o: $(srcdir)/src/qt/timectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/timectrl.cpp
monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
@ -21700,6 +21719,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@ -23479,12 +23501,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
@ -25483,13 +25499,13 @@ coredll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(COREDLL_ODEP)
coredll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
coredll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(COREDLL_ODEP)
coredll_msw_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
coredll_msw_datetimectrl.o: $(srcdir)/src/msw/datetimectrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/datetimectrl.cpp
coredll_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(COREDLL_ODEP)
coredll_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
coredll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(COREDLL_ODEP)
@ -25660,6 +25676,9 @@ coredll_cocoa_statbmp.o: $(srcdir)/src/osx/cocoa/statbmp.mm $(COREDLL_ODEP)
coredll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
coredll_cocoa_renderer.o: $(srcdir)/src/osx/cocoa/renderer.mm $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/renderer.mm
coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
@ -25870,9 +25889,6 @@ coredll_qt_msgdlg.o: $(srcdir)/src/qt/msgdlg.cpp $(COREDLL_ODEP)
coredll_qt_notebook.o: $(srcdir)/src/qt/notebook.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/notebook.cpp
coredll_qt_palette.o: $(srcdir)/src/qt/palette.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/palette.cpp
coredll_qt_nonownedwnd.o: $(srcdir)/src/qt/nonownedwnd.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/nonownedwnd.cpp
@ -25969,6 +25985,12 @@ coredll_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(COREDLL_ODEP)
coredll_qt_treectrl.o: $(srcdir)/src/qt/treectrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/treectrl.cpp
coredll_qt_datectrl.o: $(srcdir)/src/qt/datectrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/datectrl.cpp
coredll_qt_timectrl.o: $(srcdir)/src/qt/timectrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/timectrl.cpp
coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
@ -26536,6 +26558,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@ -28315,12 +28340,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
@ -29197,13 +29216,13 @@ corelib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(CORELIB_ODEP)
corelib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
corelib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(CORELIB_ODEP)
corelib_msw_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
corelib_msw_datetimectrl.o: $(srcdir)/src/msw/datetimectrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/datetimectrl.cpp
corelib_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(CORELIB_ODEP)
corelib_msw_timectrl.o: $(srcdir)/src/msw/timectrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/timectrl.cpp
corelib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(CORELIB_ODEP)
@ -29374,6 +29393,9 @@ corelib_cocoa_statbmp.o: $(srcdir)/src/osx/cocoa/statbmp.mm $(CORELIB_ODEP)
corelib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
corelib_cocoa_renderer.o: $(srcdir)/src/osx/cocoa/renderer.mm $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/renderer.mm
corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
@ -29584,9 +29606,6 @@ corelib_qt_msgdlg.o: $(srcdir)/src/qt/msgdlg.cpp $(CORELIB_ODEP)
corelib_qt_notebook.o: $(srcdir)/src/qt/notebook.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/notebook.cpp
corelib_qt_palette.o: $(srcdir)/src/qt/palette.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/palette.cpp
corelib_qt_nonownedwnd.o: $(srcdir)/src/qt/nonownedwnd.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/nonownedwnd.cpp
@ -29683,6 +29702,12 @@ corelib_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(CORELIB_ODEP)
corelib_qt_treectrl.o: $(srcdir)/src/qt/treectrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/treectrl.cpp
corelib_qt_datectrl.o: $(srcdir)/src/qt/datectrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/datectrl.cpp
corelib_qt_timectrl.o: $(srcdir)/src/qt/timectrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/timectrl.cpp
corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
@ -30250,6 +30275,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
@ -32029,12 +32057,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp

View file

@ -337,7 +337,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/msgdlg.h
wx/qt/nonownedwnd.h
wx/qt/notebook.h
wx/qt/palette.h
wx/qt/pen.h
wx/qt/popupwin.h
wx/qt/printdlg.h
@ -375,6 +374,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/dvrenderers.h
$(QT_PLATFORM_HDR)
wx/qt/treectrl.h
wx/generic/paletteg.h
wx/qt/datectrl.h
wx/qt/timectrl.h
</set>
<set var="QT_SRC" hints="files">
@ -440,7 +442,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/minifram.cpp
src/qt/msgdlg.cpp
src/qt/notebook.cpp
src/qt/palette.cpp
src/qt/nonownedwnd.cpp
src/qt/pen.cpp
src/qt/popupwin.cpp
@ -473,6 +474,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/window.cpp
$(QT_PLATFORM_SRC)
src/qt/treectrl.cpp
src/generic/paletteg.cpp
src/qt/datectrl.cpp
src/qt/timectrl.cpp
</set>
<set var="MEDIA_QT_SRC" hints="files">
@ -2153,7 +2157,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/carbon/mdi.cpp
src/osx/carbon/metafile.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/renderer.cpp
src/osx/carbon/statbrma.cpp
src/osx/carbon/region.cpp
<!-- cocoa bridge -->
@ -2334,6 +2337,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/cocoa/activityindicator.mm
src/osx/cocoa/statbmp.mm
src/osx/core/display.cpp
src/osx/cocoa/renderer.mm
</set>
<set var="OSX_COCOA_HDR" hints="files">
wx/osx/cocoa/chkconf.h

View file

@ -2,7 +2,6 @@
// Name: libsample.cpp
// Purpose: The source of a dummy sample wx-based library
// Author: Francesco Montorsi
// Modified by:
// Created: 26/11/06
// Copyright: (c) Francesco Montorsi
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: minimal.cpp
// Purpose: Minimal wxWidgets sample
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence

View file

@ -25,7 +25,7 @@ Files
* functions.cmake
* contains various wxWidgets specific functions and macros used throughout
the CMake files
* Every function should contain a short description of it's parameters as
* Every function should contain a short description of its parameters as
a comment before the function/macro
* install.cmake
* Handles definitions for the `install` and `uninstall` target

View file

@ -255,7 +255,6 @@ set(QT_HDR
wx/qt/msgdlg.h
wx/qt/nonownedwnd.h
wx/qt/notebook.h
wx/qt/palette.h
wx/qt/pen.h
wx/qt/popupwin.h
wx/qt/printdlg.h
@ -288,6 +287,9 @@ set(QT_HDR
wx/generic/activityindicator.h
${QT_PLATFORM_HDR}
wx/qt/treectrl.h
wx/generic/paletteg.h
wx/qt/datectrl.h
wx/qt/timectrl.h
)
set(QT_SRC
@ -346,7 +348,6 @@ set(QT_SRC
src/qt/msgdlg.cpp
src/qt/nonownedwnd.cpp
src/qt/notebook.cpp
src/qt/palette.cpp
src/qt/pen.cpp
src/qt/popupwin.cpp
src/qt/printdlg.cpp
@ -386,6 +387,9 @@ set(QT_SRC
src/qt/taskbar.cpp
${QT_PLATFORM_SRC}
src/qt/treectrl.cpp
src/generic/paletteg.cpp
src/qt/datectrl.cpp
src/qt/timectrl.cpp
)
set(MEDIA_QT_SRC
@ -2032,7 +2036,6 @@ set(OSX_COMMON_SRC
src/osx/carbon/mdi.cpp
src/osx/carbon/metafile.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/renderer.cpp
src/osx/carbon/statbrma.cpp
src/osx/carbon/region.cpp
# cocoa bridge
@ -2208,6 +2211,7 @@ set(OSX_COCOA_SRC
src/osx/core/sound.cpp
src/osx/cocoa/statbmp.mm
src/osx/core/display.cpp
src/osx/cocoa/renderer.mm
)
set(OSX_COCOA_HDR

View file

@ -11,22 +11,22 @@
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
function(wx_set_source_groups)
source_group("Common Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/.*\\.h")
source_group("Common Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/common/.*")
source_group("GTK+ Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/gtk/.*")
source_group("MSW Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/msw/.*")
source_group("OSX Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/osx/.*")
source_group("Generic Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/generic/.*")
source_group("wxUniv Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/univ/.*")
source_group("wxHTML Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/html/.*")
source_group("Setup Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/.*/setup.h")
source_group("GTK+ Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/gtk/.*")
source_group("MSW Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/msw/.*")
source_group("OSX Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/osx/.*")
source_group("Generic Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/generic/.*")
source_group("wxUniv Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/univ/.*")
source_group("wxHTML Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/html/.*")
source_group("Common Headers" REGULAR_EXPRESSION "/include/wx/.*\\.h")
source_group("Common Sources" REGULAR_EXPRESSION "/src/common/.*")
source_group("GTK+ Sources" REGULAR_EXPRESSION "/src/gtk/.*")
source_group("MSW Sources" REGULAR_EXPRESSION "/src/msw/.*")
source_group("OSX Sources" REGULAR_EXPRESSION "/src/osx/.*")
source_group("Generic Sources" REGULAR_EXPRESSION "/src/generic/.*")
source_group("wxUniv Sources" REGULAR_EXPRESSION "/src/univ/.*")
source_group("wxHTML Sources" REGULAR_EXPRESSION "/src/html/.*")
source_group("Setup Headers" REGULAR_EXPRESSION "/include/.*/setup.h")
source_group("GTK+ Headers" REGULAR_EXPRESSION "/include/wx/gtk/.*")
source_group("MSW Headers" REGULAR_EXPRESSION "/include/wx/msw/.*")
source_group("OSX Headers" REGULAR_EXPRESSION "/include/wx/osx/.*")
source_group("Generic Headers" REGULAR_EXPRESSION "/include/wx/generic/.*")
source_group("wxUniv Headers" REGULAR_EXPRESSION "/include/wx/univ/.*")
source_group("wxHTML Headers" REGULAR_EXPRESSION "/include/wx/html/.*")
source_group("Setup Headers" FILES ${wxSETUP_HEADER_FILE})
source_group("Resource Files" REGULAR_EXPRESSION "${wxSOURCE_DIR}/[^.]*.(rc|ico|png|icns|manifest|plist)$")
source_group("Resource Files" REGULAR_EXPRESSION "/[^.]*.(rc|ico|png|icns|manifest|plist)$")
source_group("CMake" REGULAR_EXPRESSION "(CMakeLists\\.txt|cmake_pch.*|.*_CXX_prefix\\.hxx\\.rule)$")
endfunction()

View file

@ -233,6 +233,7 @@ QT_HDR =
wx/generic/fontpickerg.h
wx/generic/icon.h
wx/generic/imaglist.h
wx/generic/paletteg.h
wx/generic/prntdlgg.h
wx/qt/accel.h
wx/qt/anybutton.h
@ -257,6 +258,7 @@ QT_HDR =
wx/qt/dataobj.h
wx/qt/dataobj2.h
wx/qt/dataview.h
wx/qt/datectrl.h
wx/qt/dc.h
wx/qt/dcclient.h
wx/qt/dcmemory.h
@ -283,7 +285,6 @@ QT_HDR =
wx/qt/msgdlg.h
wx/qt/nonownedwnd.h
wx/qt/notebook.h
wx/qt/palette.h
wx/qt/pen.h
wx/qt/popupwin.h
wx/qt/printdlg.h
@ -304,6 +305,7 @@ QT_HDR =
wx/qt/textctrl.h
wx/qt/textentry.h
wx/qt/tglbtn.h
wx/qt/timectrl.h
wx/qt/toolbar.h
wx/qt/tooltip.h
wx/qt/toplevel.h
@ -322,6 +324,7 @@ QT_SRC=
src/generic/fontpickerg.cpp
src/generic/icon.cpp
src/generic/imaglist.cpp
src/generic/paletteg.cpp
src/generic/prntdlgg.cpp
src/generic/textmeasure.cpp
src/qt/accel.cpp
@ -347,6 +350,7 @@ QT_SRC=
src/qt/cursor.cpp
src/qt/dataobj.cpp
src/qt/dataview.cpp
src/qt/datectrl.cpp
src/qt/dc.cpp
src/qt/dcclient.cpp
src/qt/dcmemory.cpp
@ -375,7 +379,6 @@ QT_SRC=
src/qt/msgdlg.cpp
src/qt/nonownedwnd.cpp
src/qt/notebook.cpp
src/qt/palette.cpp
src/qt/pen.cpp
src/qt/popupwin.cpp
src/qt/printdlg.cpp
@ -398,6 +401,7 @@ QT_SRC=
src/qt/textctrl.cpp
src/qt/textentry.cpp
src/qt/tglbtn.cpp
src/qt/timectrl.cpp
src/qt/timer.cpp
src/qt/toolbar.cpp
src/qt/tooltip.cpp
@ -2018,7 +2022,6 @@ OSX_COMMON_SRC =
src/osx/carbon/mdi.cpp
src/osx/carbon/metafile.cpp
src/osx/carbon/popupwin.cpp
src/osx/carbon/renderer.cpp
src/osx/carbon/statbrma.cpp
src/osx/carbon/region.cpp
# cocoa bridge
@ -2169,6 +2172,7 @@ OSX_COCOA_SRC =
src/osx/cocoa/preferences.mm
src/osx/cocoa/printdlg.mm
src/osx/cocoa/radiobut.mm
src/osx/cocoa/renderer.mm
src/osx/cocoa/scrolbar.mm
src/osx/cocoa/settings.mm
src/osx/cocoa/slider.mm

View file

@ -3,10 +3,6 @@
<PropertyGroup Label="Configuration">
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>

View file

@ -31,9 +31,6 @@
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='ARM64'">
<wxArchSuffix>_arm64</wxArchSuffix>
</PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Itanium'">
<wxArchSuffix>_ia64</wxArchSuffix>
</PropertyGroup>
<PropertyGroup Label="UserMacros" Condition="('$(Configuration)'=='Debug' or '$(Configuration)'=='DLL Debug')">
<wxSuffixDebug>d</wxSuffixDebug>
</PropertyGroup>
@ -80,7 +77,6 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions Condition="'$(PlatformToolset)' == 'v140_xp'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="('$(Configuration)'=='Release' or '$(Configuration)'=='DLL Release') and '$(VisualStudioVersion)' >= '14.0'">/Zc:throwingNew %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,6 @@
// Name: canvas.cpp
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: canvas.h
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: card.cpp
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: card.h
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: forty.cpp
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: forty.h
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: game.cpp
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: game.h
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: pile.cpp
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: pile.h
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: playerdg.cpp
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: playerdg.h
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: scoredg.cpp
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: scoredg.h
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: scorefil.cpp
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: scorefil.h
// Purpose: Forty Thieves patience game
// Author: Chris Breeze
// Modified by:
// Created: 21/07/97
// Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: fractal.cpp
// Purpose: demo of wxConfig and related classes
// Author: Andrew Davison
// Modified by:
// Created: 05.04.94
// Copyright: (c) 1994 Andrew Davison
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: life/dialogs.cpp
// Purpose: Life! dialogs
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: dialogs.h
// Purpose: Life! dialogs
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: game.cpp
// Purpose: Life! game logic
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: game.h
// Purpose: Life! game logic
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: life.cpp
// Purpose: The game of Life, created by J. H. Conway
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: life.h
// Purpose: The game of Life, created by J. H. Conway
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: reader.cpp
// Purpose: Life! pattern reader (writer coming soon)
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: reader.h
// Purpose: Life! pattern reader (writer coming soon)
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: samples.inc
// Purpose: Sample configurations for Life!
// Author: Guillermo Rodriguez Garcia, <guille@iies.es>
// Modified by:
// Created: Jan/2000
// Copyright: (c) 2000, Guillermo Rodriguez Garcia
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: minimal.cpp
// Purpose: Minimal wxWidgets sample
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence

View file

@ -77,6 +77,11 @@ Changes in behaviour not resulting in compilation errors
called any longer by default, you need to explicitly enable 3.0 compatibility
or change your code to override the newer overload, taking a wxWindow pointer.
- wxImageList size is now expressed in physical pixels, i.e. its size must be
the same as the size of bitmaps added to it, in pixels. This is inconvenient
but should be viewed as a hint not to use wxImageList (but wxBitmapBundle)
in the applications supporting high DPI.
Changes in behaviour which may result in build errors
-----------------------------------------------------

View file

@ -125,7 +125,7 @@ Update https://www.wxwidgets.org:
anything else, the page will dynamically show the release files with the
specified prefixes).
* Add a news item. Usually a news item is enough but something
more can be called for for major releases
more can be called for major releases
* Push the changes (or create the PR with them) to GitHub. Note that this will
trigger the site rebuild which will fail if the release statistics are not
available yet, so make sure to publish the release on GitHub first (or wait

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before After
Before After

View file

@ -210,6 +210,10 @@ Currently the following symbols exist:
Windows resource files</a> resource files are available on the current platform.
Usually wxHAS_IMAGE_RESOURCES should be used instead.}
@itemdef{wxHAS_POWER_EVENTS, Defined if wxPowerEvent are ever generated on the current platform.}
@itemdef{wxHAS_PREMULTIPLIED_ALPHA, Defined if wxBitmap stores raw pixel color
values premultiplied (scaled) by alpha. This is generally used to switch
whether to premultiply before storing pixels via wxAlphaPixelData converted
from a straight alpha source.}
@itemdef{wxHAS_RADIO_MENU_ITEMS,
Defined if the current port supports radio menu items (see wxMenu::AppendRadioItem).}
@itemdef{wxHAS_RAW_BITMAP, Defined if direct access to bitmap data using the classes in @c wx/rawbmp.h is supported.}

View file

@ -923,7 +923,7 @@ control.
@section page_samples_webview wxWebView Sample
The wxWebView sample demonstarates the various capabilities of the wxWebView
The wxWebView sample demonstrates the various capabilities of the wxWebView
control. It is set up as a simple single window web browser, but with support
for many of the more complex wxWebView features, including browsing through
archives.

View file

@ -45,6 +45,12 @@ wxWidgets programs.
This can be helpful when running older programs recompiled with
wxWidgets 3.1 or later, as these asserts are mostly harmless and can
be safely ignored if the code works as expected.}
@itemdef{WXSUPPRESS_GTK_DIAGNOSTICS,
If set to a non-zero value, wxApp::GTKSuppressDiagnostics() is called
on program startup using the numeric value of this variable or the
default value if it's not a number, so that e.g. setting it to "yes"
suppresses all GTK diagnostics while setting it to 16 only suppresses
GTK warning messages.}
*/
@see wxSystemOptions

View file

@ -187,7 +187,17 @@ e.g. if you use `AC_CONFIG_MACRO_DIRS([m4])`).
For applications using Microsoft Visual Studio IDE, simply add the provided
`wxwidgets.props` property sheet file to your project as explained in the
[instructions](@ref msw_build_apps) and build the project as usual.
[instructions](@ref msw_build_apps_msvc) and build the project as usual.
### MSW, with MinGW
If you use MinGW in any Unix-like environment (Cygwin, MSYS2 etc), please
follow the instructions for Unix systems.
Otherwise, i.e. when building using `mingw32-make` or using `g++` directly from
the command line, please follow [these instructions](@ref msw_build_apps_other)
and provide the list of required compiler and build options manually.
### Mac, with Xcode
@ -233,4 +243,4 @@ If you use another IDE, under Unix you should run `wx-config --cxxflags` and
`wx-config --libs` commands separately and copy-and-paste their output to the
"Additional preprocessor options" and "Additional linker options" fields in
your IDE, respectively. Under MSW systems you need to configure the IDE using
the instructions in the [manual setup](@ref msw_build_apps) section.
the instructions in the [manual setup](@ref msw_build_apps_other) section.

View file

@ -36,7 +36,7 @@ To implement non-blocking operations @e without using multiple threads you have
two possible implementation choices:
- use wxIdleEvent (e.g. to perform a long calculation while updating a progress dialog)
- do everything at once but call wxWindow::Update() or wxApp::YieldFor(wxEVT_CATEGORY_UI)
- do everything at once but call wxWindow::Update() or wxEventLoopBase::YieldFor(wxEVT_CATEGORY_UI)
periodically to update the screen.
However, it is generally much better to run time-consuming tasks in worker threads instead

View file

@ -35,10 +35,12 @@ All binaries are available at:
https://www.wxwidgets.org/downloads#v3.2.0_msw
Once you have the files you need, unzip all of them into the same directory, for
example `c:\wx\3.2.0`. You should have only include and lib subdirectories under
it, nothing else. To avoid hard-coding this path into your projects, define
`wxwin` environment variable containing it: although it's a little known fact,
all versions of MSVC support environment variable expansion in the C++ projects
example `c:\wx\3.2.0`. You should have `include` and `lib` subdirectories under
this directory, as well as files such as `wxwidgets.props`.
Note: To avoid hard-coding this path into your projects, define `wxwin`
environment variable containing it: although it's a little known fact, all
versions of MSVC support environment variable expansion in the C++ projects
(but not, unfortunately, in the solution files).
Using Binaries with Visual Studio

View file

@ -414,6 +414,12 @@ The full list of the build settings follows:
Building Applications Using wxWidgets {#msw_build_apps}
=====================================
Note: If you want to use CMake for building your project, please see
@ref overview_cmake.
Using Microsoft Visual C++ IDE {#msw_build_apps_msvc}
------------------------------
If you use MSVS for building your project, simply add
`wxwidgets.props` property sheet to (all) your project(s) using wxWidgets
by using "View|Property Manager" menu item to open the property manager
@ -425,10 +431,8 @@ If you've created a new empty project (i.e. chose "Empty Project" in the
you need to change "Linker|System|SubSystem" in the project properties to
"Windows", from the default "Console". You don't need to do anything else.
If you want to use CMake for building your project, please see
@ref overview_cmake.
Otherwise follow the instructions below for "manual" setup of your project.
Using Other Compilers or Command Line {#msw_build_apps_other}
-------------------------------------
We suppose that wxWidgets sources are under the directory `$WXWIN` (notice that
different tool chains refer to environment variables such as WXWIN in
@ -436,13 +440,14 @@ different ways, e.g. MSVC users should use `$``(WXWIN)` instead of just
`$WXWIN`). And we will use `<wx-lib-dir>` as a shortcut for the subdirectory of
`$WXWIN\lib` which is composed from several parts separated by underscore:
first, a compiler-specific prefix (e.g. "vc" for MSVC, "gcc" for g++ or the
value of `COMPILER_PREFIX` if you set it explicitly), then optional "x64" if
building in 64 bits and finally either "lib" or "dll" depending on whether
static or dynamic wx libraries are being used.
value of `COMPILER_PREFIX` if you set it explicitly), then "x64" if building in
64 bits using MSVC (but not any other compilers) and finally either "lib" or
"dll" depending on whether static or dynamic wx libraries are being used.
For example, WXWIN could be "c:\wxWidgets\3.4.5" and `<wx-lib-dir>` could be
`c:\wxWidgets\3.4.5\lib\vc_x64_lib` for 64-bit static libraries built with
MSVC.
MSVC but for shared libraries built with gcc it would be
`c:\wxWidgets\3.4.5\lib\gcc_dll` instead.
Here is what you need to do:
@ -450,28 +455,44 @@ Here is what you need to do:
- compiler
- resource compiler
include paths.
* If using MSVC, prepend `$WXWIN\include\msvc` to the include paths too.
Otherwise, append `<wx-lib-dir>\mswu[d]` to the include paths, where "d" should
* Append `<wx-lib-dir>\mswu[d]` to the include paths, where "d" should
be used for debug builds only.
When using MSVC, there is a simpler alternative which allows to use the
same compiler options for debug and release builds: just prepend
`$WXWIN\include\msvc` to the include paths **instead** of the paths above.
* Define the following symbols for the preprocessor:
- `__WXMSW__` to ensure you use the correct wxWidgets port.
- `NDEBUG` if you want to build in release mode, i.e. disable asserts.
- `WXUSINGDLL` if you are using DLL build of wxWidgets.
* Add `<wx-lib-dir>` directory described above to the libraries path.
When using MSVC, the libraries are linked automatically using "#pragma
comment(lib)" feature of this compiler. With all the other compilers you also
need to:
When using MSVC, using `include\msvc` in the compiler include path has another
advantage: the header found in this directory ensures that all the required
libraries are linked automatically using `#pragma comment(lib)` feature of this
compiler. With the other compilers, or if you don't use `include\msvc` with
MSVC, you also need to:
* Add the list of libraries to link with to the linker input. The exact list
depends on which libraries you use and whether you built wxWidgets in
monolithic or default multlib mode and basically should include all the
relevant libraries from the directory above, e.g. `wxmsw31ud_core.lib
wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib
wxexpatd.lib` for a debug build of an application using the core library only
(all wxWidgets applications use the base library).
monolithic or default multi-lib mode and basically should include all the
relevant libraries from the directory above, e.g. `wxmsw34ud_core.lib
wxbase34ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib
wxexpatd.lib` for a debug build of an application using the core library of
wxWidgets 3.4 only (all wxWidgets applications use the base library).
For example, to compile your program with gcc using debug wxWidgets DLLs
you would need to use the following options for the compiler (and `windres`
resource compiler):
-I$WXWIN/include -I$WXWIN/lib/gcc_dll/mswud -D__WXMSW__ -DWXUSINGDLL
and
-L$WXWIN/lib/gcc_dll
for the linker.
Finally, please notice that the makefiles and project files provided with
wxWidgets samples show which flags should be used when building applications
using wxWidgets and always work, so in case of a problem, e.g. if the

View file

@ -54,7 +54,7 @@ Qt objects needs to be sub-classed to re-implement events and connect signals (m
The approach chosen was to use templates to help inherit QObject's (QWidget), providing a common base to handle events and signal infrastructure:
* `wxQtSignalHandler< wxWindow >`: allows emitting wx events for Qt events & signals. This should be used used for all QObjects derivatives that are not widgets, for example QAction (used for shortcut / accelerators).
* `wxQtSignalHandler< wxWindow >`: allows emitting wx events for Qt events & signals. This should be used for all QObjects derivatives that are not widgets, for example QAction (used for shortcut / accelerators).
* `wxQtEventSignalHandler< QWidget, wxWindow >`: derived from `wxQtSignalHandler`, also handles basic events (change, focus, mouse, keyboard, paint, close, etc.). This should be used for all QWidget derivatives (controls, top level windows, etc.)
### Delete later

View file

@ -118,7 +118,7 @@ for Windows (ran from Git Bash, or any other Unix-like shell):
Building wxGT on Android {#qt_android}
--------------------------
Download Android Native Development Kit (NDK), tandalone Android Software
Download Android Native Development Kit (NDK), standalone Android Software
Development Kit (SDK), install them and perform the following instructions to
prepare the cross-compilation tool-chain to (change NDK and other paths):

View file

@ -2,7 +2,6 @@
// Name: msvc/wx/setup.h
// Purpose: wrapper around the real wx/setup.h for Visual C++
// Author: Vadim Zeitlin
// Modified by:
// Created: 2004-12-12
// Copyright: (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence

View file

@ -25,7 +25,7 @@ class WXDLLIMPEXP_ADV wxAboutDialogInfo
{
public:
// all fields are initially uninitialized
wxAboutDialogInfo() { }
wxAboutDialogInfo() = default;
// accessors for various simply fields
// -----------------------------------

View file

@ -2,7 +2,6 @@
// Name: wx/accel.h
// Purpose: wxAcceleratorEntry and wxAcceleratorTable classes
// Author: Julian Smart, Robert Roebling, Vadim Zeitlin
// Modified by:
// Created: 31.05.01 (extracted from other files)
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/access.h
// Purpose: Accessibility classes
// Author: Julian Smart
// Modified by:
// Created: 2003-02-12
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
@ -234,7 +233,7 @@ class WXDLLIMPEXP_CORE wxAccessibleBase : public wxObject
public:
wxAccessibleBase(wxWindow* win): m_window(win) {}
virtual ~wxAccessibleBase() {}
virtual ~wxAccessibleBase() = default;
// Overridables

View file

@ -24,8 +24,8 @@ class WXDLLIMPEXP_CORE wxAddRemoveAdaptor
{
public:
// Default ctor and trivial but virtual dtor.
wxAddRemoveAdaptor() { }
virtual ~wxAddRemoveAdaptor() { }
wxAddRemoveAdaptor() = default;
virtual ~wxAddRemoveAdaptor() = default;
// Override to return the associated control.
virtual wxWindow* GetItemsCtrl() const = 0;

View file

@ -38,8 +38,8 @@ struct wxMatrix2D
class WXDLLIMPEXP_CORE wxAffineMatrix2DBase
{
public:
wxAffineMatrix2DBase() {}
virtual ~wxAffineMatrix2DBase() {}
wxAffineMatrix2DBase() = default;
virtual ~wxAffineMatrix2DBase() = default;
// sets the matrix to the respective values
virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0;

View file

@ -2,7 +2,6 @@
// Name: wx/afterstd.h
// Purpose: #include after STL headers
// Author: Vadim Zeitlin
// Modified by:
// Created: 07/07/03
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/android/chkconf.h
// Purpose: Android-specific configuration options checks
// Author: Zsolt Bakcsi
// Modified by:
// Created: 2011-12-08
// RCS-ID:
// Copyright: (c) wxWidgets team

View file

@ -2,7 +2,6 @@
// Name: wx/android/config_android.h
// Purpose: configurations for Android builds
// Author: Zsolt Bakcsi
// Modified by:
// Created: 2011-12-02
// RCS-ID:
// Copyright: (c) wxWidgets team

View file

@ -154,7 +154,7 @@ private:
class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl
{
public:
wxAnimationCtrlBase() { }
wxAnimationCtrlBase() = default;
// public API
virtual bool LoadFile(const wxString& filename,

View file

@ -2,7 +2,6 @@
// Name: wx/any.h
// Purpose: wxAny class
// Author: Jaakko Salli
// Modified by:
// Created: 07/05/2009
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
@ -248,7 +247,7 @@ public:
: m_value(value)
{
}
virtual ~DataHolder() { }
virtual ~DataHolder() = default;
T2 m_value;
private:
@ -299,7 +298,7 @@ class wxAnyValueTypeImplBase : public wxAnyValueType
public:
wxAnyValueTypeImplBase() : wxAnyValueType() { }
virtual ~wxAnyValueTypeImplBase() { }
virtual ~wxAnyValueTypeImplBase() = default;
virtual void DeleteValue(wxAnyValueBuffer& buf) const override
{
@ -349,7 +348,7 @@ class wxAnyValueTypeImpl : public wxAnyValueTypeImplBase<T>
WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl<T>)
public:
wxAnyValueTypeImpl() : wxAnyValueTypeImplBase<T>() { }
virtual ~wxAnyValueTypeImpl() { }
virtual ~wxAnyValueTypeImpl() = default;
virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType,
@ -377,7 +376,7 @@ class wxAnyValueTypeImpl<T> : public wxAnyValueTypeImpl##CLSTYPE \
typedef wxAnyBase##CLSTYPE##Type UseDataType; \
public: \
wxAnyValueTypeImpl() : wxAnyValueTypeImpl##CLSTYPE() { } \
virtual ~wxAnyValueTypeImpl() { } \
virtual ~wxAnyValueTypeImpl() = default; \
static void SetValue(const T& value, wxAnyValueBuffer& buf) \
{ \
void* voidPtr = reinterpret_cast<void*>(&buf.m_buffer[0]); \
@ -427,7 +426,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImplInt :
public:
wxAnyValueTypeImplInt() :
wxAnyValueTypeImplBase<wxAnyBaseIntType>() { }
virtual ~wxAnyValueTypeImplInt() { }
virtual ~wxAnyValueTypeImplInt() = default;
virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType,
@ -442,7 +441,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImplUint :
public:
wxAnyValueTypeImplUint() :
wxAnyValueTypeImplBase<wxAnyBaseUintType>() { }
virtual ~wxAnyValueTypeImplUint() { }
virtual ~wxAnyValueTypeImplUint() = default;
virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType,
@ -479,7 +478,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImpl##TYPENAME : \
public: \
wxAnyValueTypeImpl##TYPENAME() : \
wxAnyValueTypeImplBase<T>() { } \
virtual ~wxAnyValueTypeImpl##TYPENAME() { } \
virtual ~wxAnyValueTypeImpl##TYPENAME() = default; \
virtual bool ConvertValue(const wxAnyValueBuffer& src, \
wxAnyValueType* dstType, \
wxAnyValueBuffer& dst) const override \
@ -493,7 +492,7 @@ class wxAnyValueTypeImpl<T> : public wxAnyValueTypeImpl##TYPENAME \
{ \
public: \
wxAnyValueTypeImpl() : wxAnyValueTypeImpl##TYPENAME() { } \
virtual ~wxAnyValueTypeImpl() { } \
virtual ~wxAnyValueTypeImpl() = default; \
};
#define WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, CONVFUNC, BT) \
@ -531,7 +530,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImpl<bool> :
public:
wxAnyValueTypeImpl() :
wxAnyValueTypeImplBase<bool>() { }
virtual ~wxAnyValueTypeImpl() { }
virtual ~wxAnyValueTypeImpl() = default;
virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType,
@ -548,7 +547,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImplDouble :
public:
wxAnyValueTypeImplDouble() :
wxAnyValueTypeImplBase<double>() { }
virtual ~wxAnyValueTypeImplDouble() { }
virtual ~wxAnyValueTypeImplDouble() = default;
virtual bool ConvertValue(const wxAnyValueBuffer& src,
wxAnyValueType* dstType,
@ -576,7 +575,7 @@ class DECL wxAnyValueTypeImpl<CLS> : \
public: \
wxAnyValueTypeImpl() : \
wxAnyValueTypeImplBase<CLS>() { } \
virtual ~wxAnyValueTypeImpl() { } \
virtual ~wxAnyValueTypeImpl() = default; \
\
virtual bool ConvertValue(const wxAnyValueBuffer& src, \
wxAnyValueType* dstType, \
@ -627,7 +626,7 @@ class WXDLLIMPEXP_BASE wxAnyValueTypeImplVariantData :
public:
wxAnyValueTypeImplVariantData() :
wxAnyValueTypeImplBase<wxVariantData*>() { }
virtual ~wxAnyValueTypeImplVariantData() { }
virtual ~wxAnyValueTypeImplVariantData() = default;
virtual void DeleteValue(wxAnyValueBuffer& buf) const override
{
@ -674,7 +673,7 @@ class wxAnyValueTypeImpl<wxVariantData*> :
{
public:
wxAnyValueTypeImpl() : wxAnyValueTypeImplVariantData() { }
virtual ~wxAnyValueTypeImpl() { }
virtual ~wxAnyValueTypeImpl() = default;
};
#endif // wxUSE_VARIANT

View file

@ -51,7 +51,7 @@
class WXDLLIMPEXP_CORE wxAnyButtonBase : public wxControl
{
public:
wxAnyButtonBase() { }
wxAnyButtonBase() = default;
// show the image in the button in addition to the label: this method is
// supported on all (major) platforms

View file

@ -3,7 +3,6 @@
// Purpose: wxAppBase class and macros used for declaration of wxApp
// derived class in the user code
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// Copyright: (c) Julian Smart
// Licence: wxWindows licence

View file

@ -15,8 +15,8 @@
class WXDLLIMPEXP_CORE wxAppProgressIndicatorBase
{
public:
wxAppProgressIndicatorBase() {}
virtual ~wxAppProgressIndicatorBase() {}
wxAppProgressIndicatorBase() = default;
virtual ~wxAppProgressIndicatorBase() = default;
virtual bool IsAvailable() const = 0;

View file

@ -2,7 +2,6 @@
// Name: wx/apptrait.h
// Purpose: declaration of wxAppTraits and derived classes
// Author: Vadim Zeitlin
// Modified by:
// Created: 19.06.2003
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
@ -40,7 +39,7 @@ class WXDLLIMPEXP_BASE wxAppTraitsBase
{
public:
// needed since this class declares virtual members
virtual ~wxAppTraitsBase() { }
virtual ~wxAppTraitsBase() = default;
// hooks for working with the global objects, may be overridden by the user
// ------------------------------------------------------------------------

View file

@ -23,7 +23,7 @@
class WXDLLIMPEXP_BASE wxArchiveNotifier
{
public:
virtual ~wxArchiveNotifier() { }
virtual ~wxArchiveNotifier() = default;
virtual void OnEntryUpdated(class wxArchiveEntry& entry) = 0;
};
@ -37,7 +37,7 @@ public:
class WXDLLIMPEXP_BASE wxArchiveEntry : public wxObject
{
public:
virtual ~wxArchiveEntry() { }
virtual ~wxArchiveEntry() = default;
virtual wxDateTime GetDateTime() const = 0;
virtual wxFileOffset GetSize() const = 0;
@ -92,7 +92,7 @@ class WXDLLIMPEXP_BASE wxArchiveInputStream : public wxFilterInputStream
public:
typedef wxArchiveEntry entry_type;
virtual ~wxArchiveInputStream() { }
virtual ~wxArchiveInputStream() = default;
virtual bool OpenEntry(wxArchiveEntry& entry) = 0;
virtual bool CloseEntry() = 0;
@ -129,7 +129,7 @@ private:
class WXDLLIMPEXP_BASE wxArchiveOutputStream : public wxFilterOutputStream
{
public:
virtual ~wxArchiveOutputStream() { }
virtual ~wxArchiveOutputStream() = default;
virtual bool PutNextEntry(wxArchiveEntry *entry) = 0;
@ -314,7 +314,7 @@ public:
typedef wxArchiveIter iter_type;
typedef wxArchivePairIter pairiter_type;
virtual ~wxArchiveClassFactory() { }
virtual ~wxArchiveClassFactory() = default;
wxArchiveEntry *NewEntry() const
{ return DoNewEntry(); }

View file

@ -2,7 +2,6 @@
// Name: wx/arrimpl.cpp
// Purpose: helper file for implementation of dynamic lists
// Author: Vadim Zeitlin
// Modified by:
// Created: 16.10.97
// Copyright: (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/arrstr.h
// Purpose: wxArrayString class
// Author: Mattia Barbon and Vadim Zeitlin
// Modified by:
// Created: 07/07/03
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
@ -73,7 +72,7 @@ public:
typedef int (wxCMPFUNC_CONV *CompareFunction)(const wxString& first,
const wxString& second);
wxArrayString() { }
wxArrayString() = default;
wxArrayString(size_t sz, const char** a);
wxArrayString(size_t sz, const wchar_t** a);
wxArrayString(size_t sz, const wxString* a);

View file

@ -2,7 +2,6 @@
// Name: wx/artprov.h
// Purpose: wxArtProvider class
// Author: Vaclav Slavik
// Modified by:
// Created: 18/03/2002
// Copyright: (c) Vaclav Slavik
// Licence: wxWindows licence

View file

@ -108,7 +108,7 @@ inline wxUint32 wxAtomicDec (wxUint32 &value) { return --value; }
class wxAtomicInt32
{
public:
wxAtomicInt32() { } // non initialized for consistency with basic int type
wxAtomicInt32() = default; // non initialized for consistency with basic int type
wxAtomicInt32(wxInt32 v) : m_value(v) { }
wxAtomicInt32(const wxAtomicInt32& a) : m_value(a.m_value) {}

View file

@ -2,7 +2,6 @@
// Name: wx/aui/aui.h
// Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams
// Modified by:
// Created: 2005-05-17
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1

View file

@ -2,7 +2,6 @@
// Name: wx/aui/toolbar.h
// Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams
// Modified by:
// Created: 2008-08-04
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1
@ -265,8 +264,8 @@ class WXDLLIMPEXP_AUI wxAuiToolBarArt
{
public:
wxAuiToolBarArt() { }
virtual ~wxAuiToolBarArt() { }
wxAuiToolBarArt() = default;
virtual ~wxAuiToolBarArt() = default;
virtual wxAuiToolBarArt* Clone() = 0;
virtual void SetFlags(unsigned int flags) = 0;

View file

@ -236,14 +236,19 @@ protected:
protected:
wxPoint m_clickPt;
wxWindow* m_clickTab;
bool m_isDragging;
wxAuiTabContainerButton* m_hoverButton;
wxAuiTabContainerButton* m_pressedButton;
wxPoint m_clickPt = wxDefaultPosition;
wxWindow* m_clickTab = nullptr;
bool m_isDragging = false;
wxAuiTabContainerButton* m_hoverButton = nullptr;
wxAuiTabContainerButton* m_pressedButton = nullptr;
void SetHoverTab(wxWindow* wnd);
private:
// Reset dragging-related fields above to their initial values.
void DoEndDragging();
#ifndef SWIG
wxDECLARE_CLASS(wxAuiTabCtrl);
wxDECLARE_EVENT_TABLE();

View file

@ -2,7 +2,6 @@
// Name: wx/aui/dockart.h
// Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams
// Modified by:
// Created: 2005-05-17
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1
@ -32,8 +31,8 @@ class WXDLLIMPEXP_AUI wxAuiDockArt
{
public:
wxAuiDockArt() { }
virtual ~wxAuiDockArt() { }
wxAuiDockArt() = default;
virtual ~wxAuiDockArt() = default;
virtual wxAuiDockArt* Clone() = 0;
virtual int GetMetric(int id) = 0;

View file

@ -2,7 +2,6 @@
// Name: wx/aui/floatpane.h
// Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams
// Modified by:
// Created: 2005-05-17
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1

View file

@ -2,7 +2,6 @@
// Name: wx/aui/framemanager.h
// Purpose: wxaui: wx advanced user interface - docking window manager
// Author: Benjamin I. Williams
// Modified by:
// Created: 2005-05-17
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1
@ -161,7 +160,7 @@ public:
DefaultPane();
}
~wxAuiPaneInfo() {}
~wxAuiPaneInfo() = default;
// Write the safe parts of a newly loaded PaneInfo structure "source" into "this"
// used on loading perspectives etc.

View file

@ -40,8 +40,8 @@ class WXDLLIMPEXP_AUI wxAuiTabArt
{
public:
wxAuiTabArt() { }
virtual ~wxAuiTabArt() { }
wxAuiTabArt() = default;
virtual ~wxAuiTabArt() = default;
virtual wxAuiTabArt* Clone() = 0;
virtual void SetFlags(unsigned int flags) = 0;

View file

@ -2,7 +2,6 @@
// Name: include/wx/aui/tabartgtk.h
// Purpose: declaration of the wxAuiGTKTabArt
// Author: Jens Lody and Teodor Petrov
// Modified by:
// Created: 2012-03-23
// Copyright: (c) 2012 Jens Lody <jens@codeblocks.org>
// and Teodor Petrov

View file

@ -2,7 +2,6 @@
// Name: wx/beforestd.h
// Purpose: #include before STL headers
// Author: Vadim Zeitlin
// Modified by:
// Created: 07/07/03
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/bitmap.h
// Purpose: wxBitmap class interface
// Author: Vaclav Slavik
// Modified by:
// Created: 22.04.01
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
@ -118,7 +117,7 @@ class WXDLLIMPEXP_CORE wxBitmapHandler : public wxObject
{
public:
wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; }
virtual ~wxBitmapHandler() { }
virtual ~wxBitmapHandler() = default;
// NOTE: the following functions should be pure virtuals, but they aren't
// because otherwise almost all ports would have to implement

View file

@ -162,12 +162,12 @@ public:
wxNODISCARD static wxSize
GetConsensusSizeFor(double scale, const wxVector<wxBitmapBundle>& bundles);
wxNODISCARD static wxSize
GetConsensusSizeFor(wxWindow* win, const wxVector<wxBitmapBundle>& bundles);
GetConsensusSizeFor(const wxWindow* win, const wxVector<wxBitmapBundle>& bundles);
// Create wxImageList and fill it with the images from the given bundles in
// the sizes appropriate for the DPI scaling used for the specified window.
wxNODISCARD static wxImageList*
CreateImageList(wxWindow* win, const wxVector<wxBitmapBundle>& bundles);
CreateImageList(const wxWindow* win, const wxVector<wxBitmapBundle>& bundles);
private:
typedef wxObjectDataPtr<wxBitmapBundleImpl> wxBitmapBundleImplPtr;

View file

@ -2,7 +2,6 @@
// Name: wx/bmpbuttn.h
// Purpose: wxBitmapButton class interface
// Author: Vadim Zeitlin
// Modified by:
// Created: 25.08.00
// Copyright: (c) 2000 Vadim Zeitlin
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/bmpcbox.h
// Purpose: wxBitmapComboBox base header
// Author: Jaakko Salli
// Modified by:
// Created: Aug-31-2006
// Copyright: (c) Jaakko Salli
// Licence: wxWindows licence
@ -40,7 +39,7 @@ public:
// ctors and such
wxBitmapComboBoxBase() { Init(); }
virtual ~wxBitmapComboBoxBase() { }
virtual ~wxBitmapComboBoxBase() = default;
// Sets the image for the given item.
virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) = 0;

View file

@ -2,7 +2,6 @@
// Name: wx/bookctrl.h
// Purpose: wxBookCtrlBase: common base class for wxList/Tree/Notebook
// Author: Vadim Zeitlin
// Modified by:
// Created: 19.08.03
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/brush.h
// Purpose: Includes platform-specific wxBrush file
// Author: Julian Smart
// Modified by:
// Created:
// Copyright: Julian Smart
// Licence: wxWindows Licence
@ -41,7 +40,7 @@ enum wxBrushStyle
class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject
{
public:
virtual ~wxBrushBase() { }
virtual ~wxBrushBase() = default;
virtual void SetColour(const wxColour& col) = 0;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;

View file

@ -2,7 +2,6 @@
// Name: wx/buffer.h
// Purpose: auto buffer classes: buffers which automatically free memory
// Author: Vadim Zeitlin
// Modified by:
// Created: 12.04.99
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/build.h
// Purpose: Runtime build options checking
// Author: Vadim Zeitlin, Vaclav Slavik
// Modified by:
// Created: 07.05.02
// Copyright: (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/button.h
// Purpose: wxButtonBase class
// Author: Vadim Zeitlin
// Modified by:
// Created: 15.08.00
// Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence
@ -26,7 +25,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
class WXDLLIMPEXP_CORE wxButtonBase : public wxAnyButton
{
public:
wxButtonBase() { }
wxButtonBase() = default;
// show the authentication needed symbol on the button: this is currently
// only implemented in wxMSW where it shows the UAC shield symbol

View file

@ -2,7 +2,6 @@
// Name: wx/calctrl.h
// Purpose: date-picker control
// Author: Vadim Zeitlin
// Modified by:
// Created: 29.12.99
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence

View file

@ -2,7 +2,6 @@
// Name: wx/caret.h
// Purpose: wxCaretBase class - the interface of wxCaret
// Author: Vadim Zeitlin
// Modified by:
// Created: 23.05.99
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
@ -57,7 +56,7 @@ public:
}
// a virtual dtor has been provided since this class has virtual members
virtual ~wxCaretBase() { }
virtual ~wxCaretBase() = default;
// Create() functions - same as ctor but returns the success code
// --------------------------------------------------------------

View file

@ -126,7 +126,7 @@ public:
// not used here.
explicit Test(const std::string& name = std::string()) : m_name(name) { }
virtual ~Test() { }
virtual ~Test() = default;
virtual void runTest() = 0;

View file

@ -2,7 +2,6 @@
// Name: wx/checkbox.h
// Purpose: wxCheckBox class interface
// Author: Vadim Zeitlin
// Modified by:
// Created: 07.09.00
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
@ -49,7 +48,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl
{
public:
wxCheckBoxBase() { }
wxCheckBoxBase() = default;
// set/get the checked status of the listbox
virtual void SetValue(bool value) = 0;

View file

@ -2,7 +2,6 @@
// Name: wx/checklst.h
// Purpose: wxCheckListBox class interface
// Author: Vadim Zeitlin
// Modified by:
// Created: 12.09.00
// Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence
@ -24,7 +23,7 @@
class WXDLLIMPEXP_CORE wxCheckListBoxBase : public wxListBox
{
public:
wxCheckListBoxBase() { }
wxCheckListBoxBase() = default;
// check list box specific methods
virtual bool IsChecked(unsigned int item) const = 0;

Some files were not shown because too many files have changed in this diff Show more