Commit Graph

64812 Commits

Author SHA1 Message Date
Vadim Zeitlin
7eef4a4549 Fix build with GTK+ < 2.20 due to undefined key code constants
Include gdk/gdkkeysyms.h from wx/gtk/private/gtk2-compat.h as it must be
included before it for the compatibility header to define the new names
for the key constants even when using old GTK+ versions.
2018-05-22 17:01:07 +02:00
Frédéric Bron
a195bf86a2 Make compilation with mingw-w64 possible with -std=c++17.
The definition of macros min and max in include/wx/msw/wrapgdip.h
b/include/wx/msw/wrapgdip.h was clashing with the new bessel functions
that use std::numeric_limits<T>::min/max.

So #include <cmath> before #include <gdiplus.h> and use using
declarations of std::min and max instead of macros.
2018-05-22 16:10:11 +02:00
Vadim Zeitlin
9fa9880f97 Pass known page breaks as const ref to wxHtmlDCRenderer::Render()
This method doesn't modify the known page breaks, it only uses them to
find the next one, so make it more clear by using const reference in the
function signature.
2018-05-21 19:06:21 +02:00
Vadim Zeitlin
a56b993c55 Use "for" loop in wxHtmlContainerCell::AdjustPagebreak()
Use a simpler form for iterating over all children.

No real changes.
2018-05-21 17:14:29 +02:00
Vadim Zeitlin
9544d102dd Remove unnecessary wxHtmlPrintout members initialization
Don't initialize strings to their default (empty) value, this is just
useless.
2018-05-21 16:43:49 +02:00
Vadim Zeitlin
f1ea4afdbe Make wxHtmlPrintout::m_Renderer{,Hdr} objects instead of pointers
There is no need to allocate these objects on the heap and delete them
later when we can just make them members of wxHtmlPrintout object
itself.

No real changes.
2018-05-21 16:39:02 +02:00
Vadim Zeitlin
c0b0562533 Avoid many -Wparentheses warnings from gtk/gtk.h with gcc8
Add wx/gtk/private/wrapgtk.h wrapping gtk/gtk.h in pragmas disabling
these warnings and include it everywhere instead of directly including
gtk/gtk.h.

Also include wx/gtk/private/gtk2-compat.h from this wrapper header as it
was included by 90% of the files including gtk/gtk.h itself and it seems
to be better and simpler to just always include it.
2018-05-21 12:34:04 +02:00
Vadim Zeitlin
e54ec6c191 Add wxTarHeaderBlock::Clear() method encapsulating memset()
Using memset() with objects of (non-trivial) class type results in a
-Wclass-memaccess warning with g++ 8, so avoid doing this.

Add a Clear() method allowing to do the same thing without breaking
encapsulation.
2018-05-21 12:27:26 +02:00
Vadim Zeitlin
d8200f1096 Remove unused wxTarHeaderBlock copy ctor
These objects are never copied, and if they were, the default
(compiler-generated) copy ctor would do the same thing this explicitly
defined copy ctor did, so just remove it.
2018-05-20 17:59:20 +02:00
Vadim Zeitlin
58e6355695 Rename wxTarEntryPtr_ to wxTarEntryPtr
Remove the unusual underscore at the end of the type and use a single
wxDEFINE_SCOPED_PTR_TYPE() macro instead of 2 of them to simplify code.
2018-05-20 17:58:09 +02:00
Vadim Zeitlin
d9d5e1d5f7 Remove unused wxDEFINE_SCOPED_PTR_TYPE(wxTarHeaderBlock)
wxTarHeaderBlockPtr defined by this macro was never used, so just remove
it.
2018-05-20 17:57:17 +02:00
Vadim Zeitlin
8401d3fec9 Fix coordinates adjustment for wxGenericListCtrl mouse events
wxListHeaderWindow event coordinates don't need to be adjusted, as it's
positioned at (0, 0) of its parent window anyhow, but wxListMainWindow
events do need to be adjusted to use the parent window coordinates, as
it's the only window that should be seen by the outside code -- and also
for consistency with the native MSW version.

This corrects the changes originally done in
651d7a1ff8

See #18133.
2018-05-19 15:06:35 +02:00
VZ
57f620e7e1 Merge pull request #811 from MaartenBent/cmake-and-more
CMake and sample improvements: notably, allow more samples to find their
files.
2018-05-19 15:02:22 +02:00
VZ
d48a9baf6c Merge pull request #812 from jbfove/master
Build fixes for CMake monolithic build.

Also fix building with wxUSE_{DISPLAY,PALETTE}==0.
2018-05-19 14:56:55 +02:00
Jeff Bland
fbf319641e Fix monolithic build in cmake (wxBUILD_MONOLITHIC)
- Functions that set wxMONO_* vars need to set them in parent scope, from macros instead of functions (functions would need grandparent scope)
- Fix a conflict with xml library linking Mono which made core include the wrong png headers
- Fix setting of NOPCH on windows to go through the wx_lib_compile_definitions instead of target_compile_definitions so it carries to monolithic build
- Allow use of precompiled header in MSVC via calling wx_finalize_lib(mono)
- Introduce wxMONO_NONCOMPILED_CPP_FILES to deal with set_source_files_properties only applying within the current CMakeLists file
- Fix demos building against monolithic library by using wx_exe_link_libraries instead of target_link_libraries (similar to what the tests already do)

Closes #18074
2018-05-18 19:52:42 -06:00
Jeff Bland
ffb44a2f38 Fix use of RECT in wxClientDisplayRect without including windows headers 2018-05-18 18:49:05 -06:00
Jeff Bland
8b18bbb9c7 Fix uses of wxPalette without check for wxUSE_PALETTE 2018-05-18 18:49:05 -06:00
Jeff Bland
26715a1fe0 Fix warning with missing override 2018-05-18 18:49:00 -06:00
Jeff Bland
a3363cbbfb Fix use of wxDateTime without check for wxUSE_DATETIME 2018-05-18 06:51:40 -06:00
Jeff Bland
0445b3eddd Fix extraneous parens warning 2018-05-18 06:50:58 -06:00
Maarten Bent
e99af740d9 Make wxArtProvider icon size hints DPI aware 2018-05-17 20:20:06 +02:00
Maarten Bent
bfe44c719b Do not let wxHeaderCtrl determine the minimum width
The minimum width will always be equal to the current size of the parent window (from wxGetClientRect).
As a result, controls using wxHeaderCtrl can never be shrunk (e.g. using SetSizeHints).
Problem is visible when a wxDataViewCtrl gets a lower DPI. The new minimum size is equal to the current size.
2018-05-17 20:20:05 +02:00
Maarten Bent
c97963fce0 Fix size glitch of WidgetsBookCtrl in widgets sample
The entire control is hidden until the dialog is resized.
This seems to be caused by (recent changes in) the wxPersistentManager.
This is fixed by populating the frame before restoring persistence.
(as is described in docs/doxygen/overviews/persistence.h.)
2018-05-17 20:20:05 +02:00
Maarten Bent
5758832a6e Fix invalid image size in wxBitmapComboBox widgets sample
When the wxBitmapComboBox is empty, GetBitmapSize() returns size -1,-1.
Images can not be scaled to this invalid size. Use the size of the imagelist
instead.
2018-05-17 20:20:05 +02:00
Maarten Bent
e581b72955 Look in multiple paths when searching for resource files of samples
When using an out of source build, the files are not in the default wxWidgets directories.
Also search in the current directory, parent directory and sample sub-directories.

Closes https://trac.wxwidgets.org/ticket/18118
2018-05-17 20:20:04 +02:00
Maarten Bent
de4e20ee93 CMake: copy missing files for widgets sample 2018-05-17 19:34:34 +02:00
Maarten Bent
df6b47bc6d CMake: Correct header for debug builds in MinGW compiler 2018-05-17 19:33:19 +02:00
Maarten Bent
db49de9668 CMake: correctly detect 64bit for MinGW compilers
CMAKE_CL_64 is only defined when using the 64 bit cl compiler from Microsoft.
2018-05-17 19:30:59 +02:00
Vadim Zeitlin
610db240a8 Consider g++ ABI 1011 to be compatible with 1002 too
The changes between 1010 (which was already considered equivalent to
1002) and 1011 don't seem to affect wxWidgets and the library compiled
with g++6 can be used from the application built with g++7 without any
problems.
2018-05-17 04:00:59 +02:00
Vadim Zeitlin
822809ef78 Stop forwarding DoPopupMenu() to wxGenericListCtrl main window
There doesn't seem to be anything wrong with just showing the popup menu
in this window itself and this avoids the need to do any coordinate
adjustments, which didn't work correctly for the menus shown over the
header window after the previous commit (and hadn't worked correctly for
the menus shown over the non-header area before it).

See #18133.
2018-05-17 03:41:53 +02:00
Vadim Zeitlin
0446382e82 Fix position of popup menus in wxGenericListCtrl
The position was off by the header height due to a missing translation
between wxGenericListCtrl and wxListMainWindow, in which the menu is
actually shown, coordinates.

Closes #18133.
2018-05-16 15:23:00 +02:00
Vadim Zeitlin
67cb0ad260 Fix signed/unsigned comparison warning in wxAuiMDIClientWindow
This was introduced in c2fcc14bac, see
https://github.com/wxWidgets/wxWidgets/pull/802
2018-05-15 18:45:37 +02:00
Vadim Zeitlin
4710302aec Add wxOVERRIDE to all relevant wxAuiMDIChildFrame methods
Now that this class derives from wxMDIChildFrameBase, SetTitle() and
Activate() are inherited from it.
2018-05-13 02:49:07 +02:00
Vadim Zeitlin
dca84c823c Optimize away an unnecessary extra wxAuiNotebook::DoSizing() call
There is no need to call DoSizing() again if it has just been called
from UpdateTabCtrlHeight().
2018-05-13 02:49:07 +02:00
Vadim Zeitlin
a57c192023 Adjust wxAuiMDIClientWindow tabs height to icons automatically
Don't explicitly set the default icon size, this isn't really necessary
and just prevents things from working correctly if the child frames use
icons of a different (especially bigger) size.

Still try to use the icons of the standard size by default, but let
wxAuiNotebook adjust to bigger icons if this is what we have.
2018-05-13 02:47:21 +02:00
Vadim Zeitlin
be696ed8a4 Reuse base class icon-related functions in wxAuiMDIChildFrame
Don't define GetIcon(), GetIcons() and SetIcon() at all as the base
class already implements them and just keep SetIcons(), which can now be
marked as overridden as it's inherited from wxTopLevelWindow via
wxTDIChildFrame.
2018-05-13 02:46:33 +02:00
Vadim Zeitlin
f7b0ec38dd Remove useless wxAuiMDIClientWindow::SetSelection()
It just called the base class version, so it's better to not have it at
all.
2018-05-13 02:45:40 +02:00
Vadim Zeitlin
c756d18bc4 Allow using AUI-based MDI classes in the docview sample
For testing, allow using wxAuiMDI{Parent,Child}Frame in the sample.

This change also shows that the AUI classes are now sufficiently
compatible with the standard ones for switching to them to be almost
trivial.
2018-05-13 02:45:40 +02:00
Vadim Zeitlin
6cdd564237 Redo layout from wxAuiMDIChildFrame::Show()
This makes using this class more similar to using wxMDIChildFrame and
fixes the initial appearance of docview sample child windows in AUI
mode.
2018-05-13 02:45:40 +02:00
Vadim Zeitlin
2e5554019a Allow calling wxAuiMDIChildFrame::Show()
Even if it doesn't do anything, allow calling this method even after
creating the child frame for consistency with the normal MDI
implementation.
2018-05-13 02:45:40 +02:00
Vadim Zeitlin
24e06054fc Remove wxAuiMDIChildFrame::DoShow()
This method is confusing as it's not used for implementing Show(), which
is the usual naming convention when both Foo() and DoFoo() members
exist, and gives no clear indication about what does it really do.

Just call wxWindow::Show() directly instead.

Also create the wxAuiMDIChildFrame window hidden from the beginning,
instead of creating it in a visible state and then hiding it.
2018-05-13 02:45:40 +02:00
Vadim Zeitlin
ceee16c01a Remove sizing hacks from wxAuiMDIChildFrame
There doesn't seem to be any reason for overriding DoSetSize() and
DoMoveWindow(), so just stop doing it.

Notice that this was already changed for wxGTK many years ago in
a94476deb9 and there is no reason to use
different code wxGTK and other ports.
2018-05-13 02:44:18 +02:00
Vadim Zeitlin
c1bcf16eb9 Derive wxAuiMDIChildFrame from wxFrame for consistency
Make it easier to use AUI-based MDI child frame class instead of
normal wxMDIChildFrame itself by inheriting it from the same base class.

This also allows to get rid of duplicate stubs in wxAuiMDIChildFrame.
2018-05-13 02:41:58 +02:00
Vadim Zeitlin
826ab19ac9 Add missing wxUSE_MDI check to wxAUI MDI header
The implementation file already checked for both wxUSE_AUI && wxUSE_MDI,
but wx/aui/tabmdi.h didn't check the value of the latter -- do it now.
2018-05-13 02:41:58 +02:00
Vadim Zeitlin
ff023ef6b3 Don't show docview sample --mdi option in help if it's not supported
No real changes, just avoid describing the "--mdi" option in the help
message if it's not really supported in this library build.
2018-05-13 02:41:59 +02:00
Vadim Zeitlin
f53923dd31 Left-align wxSpinCtrl contents by default
The default alignment of the text in wxSpinCtrl was changed to "right"
in 7e4952db83, which added alignment
support (see #10621), but this made it inconsistent with the native
up-down control under MSW and, perhaps more importantly, with spin
controls created from XRC as the default style was never modified there
and did not include wxALIGN_RIGHT.

Resolve this inconsistency by reverting to left-aligning the text by
default.
2018-05-12 19:14:00 +02:00
Frédéric Bron
232d123f8d Remove the separator static line in wxGenericCollapsiblePane
The horizontal static line was added to separate the button from the
child window when visible, but this didn't seem very useful and looked
bad and was inconsistent with the native GTK+ implementation as well as
similar controls commonly used under MSW (wxOSX already disabled the
static line use).

Just remove it to make things simpler and better looking.

Closes https://github.com/wxWidgets/wxWidgets/pull/804
2018-05-12 19:10:28 +02:00
Paul Cornett
98cd5a6b20 Use wxString::clear() instead of assignment to wxEmptyString 2018-05-11 10:52:56 -07:00
Paul Cornett
7d039a2e0b Fix potential memory leak
See #15991
2018-05-11 10:47:21 -07:00
Paul Cornett
ff215a4349 Use wxString::empty() instead of comparing to wxEmptyString 2018-05-11 10:22:12 -07:00