Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,200 Commits 1 Branch 330 Tags
531e988e5d2dd6b466bfc0b51f18fd0dae6b735b
Commit Graph

166 Commits

Author SHA1 Message Date
Liam Treacy
83f23cec89 Added virtual and override specifiers to derived method in ListCtrl 2019-01-24 14:31:17 +00:00
Graham Dawes
9cd566789d Added file missing from previous commit 2019-01-24 08:08:12 +00:00
phowstan
7cfb5b91a5 Implement wxStaticBox::Set/GetLabel() in wxQt 
Closes https://github.com/wxWidgets/wxWidgets/pull/1167
 2019-01-23 16:38:25 +01:00
Vadim Zeitlin
2753bb2f50 Merge branch 'qt_event_loop' of https://github.com/GeoTeric/wxWidgets 
Use QEventLoop for wxEventLoop implementation in wxQt to fix several
issues with wxEventLoop, notably avoid "QApplication::exec is already
running" errors.

See https://github.com/wxWidgets/wxWidgets/pull/1165
 2019-01-22 19:05:53 +01:00
Liam Treacy
31c2bd7aa3 Add default parameter to wxDialog::Show() in wxQt 
Closes https://github.com/wxWidgets/wxWidgets/pull/1164
 2019-01-22 15:49:44 +01:00
Vadim Zeitlin
6fbc7a7e16 Merge branch 'qt-region-fixes' 
wxQt region-related fixes: fix bugs in clipping region handling and
add wxRegion::DoCombine().

See https://github.com/wxWidgets/wxWidgets/pull/1162
 2019-01-22 15:46:19 +01:00
Vadim Zeitlin
8703f0c437 Merge branch 'qt-dropdown' 
Make wxQt wxComboBox behave more consistently with the other ports. Also
includes related fixes to wxChoice and wxTextEntry.

See https://github.com/wxWidgets/wxWidgets/pull/1161
 2019-01-22 15:45:03 +01:00
Graham Dawes
8a73f65285 Use QEventLoop to implement wxEventLoop for wxQT 2019-01-22 14:37:18 +00:00
Graham Dawes
7fa7fd1beb Don't generate idle events when the event loop is not running 2019-01-22 08:11:30 +00:00
Graham Dawes
278f4fa1d6 Add wxOVERRIDE to overriden methods 2019-01-22 08:11:30 +00:00
Vadim Zeitlin
26c9fd0033 Merge branch 'qt_listbox_failing_tests' 
Fixes for item selection and cleanup.

See https://github.com/wxWidgets/wxWidgets/pull/1159
 2019-01-21 23:43:56 +01:00
Vadim Zeitlin
c8f427181e Reuse code between wxListBox::Create() overloads 
Add DoCreate() helper to actually create and initialize QListWidget.
 2019-01-21 23:43:03 +01:00
Vadim Zeitlin
c28a8c9e7e Implement wxRegion operations in terms of DoCombine() 2019-01-21 23:34:12 +01:00
Jay Nabonne
5b8b30d243 Don't use pointer for wxDC::m_clippingRegion in wxQt 
An object can be used directly instead.
 2019-01-21 23:34:12 +01:00
Richard Smith
3618356cf1 Fix wxComboBox implementation of wxTextEntry interface 
Implement missing methods and send, or suppress, the expected events.
 2019-01-21 23:08:42 +01:00
Vadim Zeitlin
cfdf80d586 Rename wxChoice::InitialiseSort() to QtInitSort() 
Use the prefix to indicate that this function is unique to this port.

Also don't make unnecessarily make it virtual.
 2019-01-21 23:08:07 +01:00
Richard Smith
b27971c501 Use case-insensitive comparison in Qt wxComboBox and wxChoice 
Define LexicalSortProxyModel to use the same sort order in wxQt as in
the other ports.
 2019-01-21 23:08:07 +01:00
Liam Treacy
eb6b660d27 Added setStyle method to wxListBox to allow for the proper setting of sorting and selection style of the QListWidget 2019-01-21 14:04:47 +00:00
Graham Dawes
9cfecad878 Generate wxDialogInit event for wxDialog under wxQT 2019-01-21 13:53:59 +00:00
Graham Dawes
edc315a62f Add wxOVERRIDE to overriden wxDialog methods for wxQT 2019-01-21 12:49:06 +00:00
Liam Treacy
58df1ee13f Added wxOVERRIDE specifiers to qt wxListBox methods 2019-01-21 11:00:25 +00:00
Vadim Zeitlin
704f03e70e Don't use destroyed wxToolBar in wxFrame::SetToolBar() in wxQt 
Store QToolBar pointer in wxFrame itself to avoid having to query the
already half-destroyed wxToolBar object when SetToolBar() is called from
its base class dtor.

This fixes crash when toggling the toolbar in the toolbar sample.

Closes https://github.com/wxWidgets/wxWidgets/pull/1140
 2019-01-20 03:21:12 +01:00
Vadim Zeitlin
3fb84dfc0c Make wxToolBar::GetQToolBar() non-virtual and mark it as private 
This method has no reason to be virtual.

Also move it to the end of the class public section and document that
it's not part of the public API.

See https://github.com/wxWidgets/wxWidgets/pull/1140
 2019-01-20 03:21:11 +01:00
Vadim Zeitlin
61b391da90 Make wxFrame ctors inline in wxQt 
No real changes, just make trivial (and going to remain trivial)
functions inline.
 2019-01-20 03:13:04 +01:00
Vadim Zeitlin
a0d2212bba Merge branch 'qt_menuitem' of https://github.com/GeoTeric/wxWidgets 
Add wxOVERRIDE specifiers to wxMEnu{,Item,Bar} methods.

Closes https://github.com/wxWidgets/wxWidgets/pull/1146
 2019-01-19 23:05:28 +01:00
Liam Treacy
5044283b87 Adding wxOVERRIDE specifiers to wxMenu and wxMenuBar methods 2019-01-18 13:25:27 +00:00
Liam Treacy
139070b745 Removing unnecessary forward declaration 2019-01-18 13:19:08 +00:00
Liam Treacy
3cde8607ab Adding wxOVERRIDE specifiers to menuitem methods 2019-01-18 13:17:47 +00:00
Liam Treacy
7b5cd77299 Removing unnecessary forward declaration from toolbar.h 2019-01-18 11:09:18 +00:00
Vadim Zeitlin
c575f595f5 Merge branch 'qt_fix_radiobox_layout' of https://github.com/GeoTeric/wxWidgets 
Add support for grid layout for wxRadioBox under wxQt.

See https://github.com/wxWidgets/wxWidgets/pull/1136
 2019-01-18 01:14:33 +01:00
chris2oph
dd306cac77 Various wxFont fixes in wxQt 
Implement point/pixel size accessors correctly.

Implement support for strike-through fonts.

Also implement DoSetNativeFontInfo() for wxQt.

Make wxFont unit test pass by accounting for Qt-specific aspects.

Closes https://github.com/wxWidgets/wxWidgets/pull/1113
 2019-01-14 23:39:02 +01:00
Graham Dawes
4f32cfc5fb Add support for grid layout in wxRadioBox under wxQT 2019-01-11 15:11:28 +00:00
Graham Dawes
aa422c6be2 Make scrollbar private to wxWindow under wxQt 
Use QScrollbar directly instead of wxScrollbar for the window scrollbars
to ensure that wxWindow::GetChildren() doesn't return these scrollbars.

Closes https://github.com/wxWidgets/wxWidgets/pull/1124
 2019-01-10 03:55:19 +01:00
Vadim Zeitlin
7935dab2e8 Merge branch 'qt_fix_missing_rtti' of https://github.com/GeoTeric/wxWidgets 
Add missing wx RTTI macros to many classes in wxQt.

See https://github.com/wxWidgets/wxWidgets/pull/1095
 2019-01-08 00:34:30 +01:00
Richard Smith
0fbf87d11b Split single/multi line behaviour in Qt wxTextCtrl 
Introduce wxQtEdit class and wxQtMultiLineEdit and wxQtSingleLineEdit
derived classes instead of using ifs in many wxTextCtrl methods, making
the code more clear and maintainable.

Also fix some wxTextCtrl-related unit test failures with wxQt and
disable some other ones which still don't pass.

Closes https://github.com/wxWidgets/wxWidgets/pull/1039
 2018-12-24 01:52:07 +01:00
Graham Dawes
538cdc0841 Add missing RTTI to some wxQT classes 2018-12-21 15:56:46 +00:00
Graham Dawes
bc4d3a4554 Initialise m_qtPushButton in wxAnyButton's constructor. 2018-12-20 08:06:46 +00:00
Graham Dawes
ae20edb539 Fix several problem with wxMemoryDC in wxQt 
Under wxQT, wxMemoryDC was previously rendering to a temporary image
which was only being blitted back to the original wxBitmap when either
the DC wx destroyed or a new bitmap was selected (via SelectObject).

With these change wxMemoryDCImpl now draws directly to the bitmap
managed by wxBitmap, this makes the behaviour more consistent with the
MSW and GTK implementations.

Closes https://github.com/wxWidgets/wxWidgets/pull/1083
 2018-12-19 13:44:52 +01:00
Liam Treacy
e7260cffe0 Fix wxRadioBox::Show() behaviour in wxQt 
If a QGroupBox is not visible, then you cannot set any of items to be
visible. Update the implementation to match that expected by wx.

Closes https://github.com/wxWidgets/wxWidgets/pull/1065
 2018-12-12 03:23:24 +01:00
Liam Treacy
2a64b65149 Fix enabling radiobox buttons in wxQt 
If a QGroupBox is disabled, then you cannot set any of its items to be
enabled without first enabling it. Enabling/disabling it will set that
value (true/false) on all of its items, although setting the QGroupBox
to an enabled state which it already has does not result in this
behaviour.

Fix wxQt to match the expected wxRadioBox behaviour and allow the unit
test to pass.

Closes https://github.com/wxWidgets/wxWidgets/pull/1064
 2018-12-10 19:52:22 +01:00
Liam Treacy
10381cb94e Deselect all items in wxQt wxListBox::SetSelection(wxNOT_FOUND) 
Follow wxWidgets API convention in wxQt too.
 2018-12-07 00:33:01 +01:00
Liam Treacy
5e089badc0 Fix bitmap accessor for the buttons in wxQt 
Return the bitmap previously set with SetBitmap().

This fixes unit tests using GetBitmap().

Closes https://github.com/wxWidgets/wxWidgets/pull/1035
 2018-12-05 03:00:49 +01:00
Liam Treacy
16c121d4d3 Implement [GS]etLabel() for wxStaticText and wxCheckBox in wxQt 
This allows the corresponding unit tests to pass.

Closes https://github.com/wxWidgets/wxWidgets/pull/1033
 2018-12-05 02:55:54 +01:00
Richard Smith
6b7b43d1fe Get WxQt menu titles passing GUI tests 2018-11-21 12:58:23 +00:00
Tim Stahlhut
71a2fc0706 Forward declare wxQt template class 2018-10-21 22:01:49 -04:00
Vadim Zeitlin
bc974910ec Implement setting bitmaps for the menu item for wxQt 
Closes https://github.com/wxWidgets/wxWidgets/pull/975
 2018-10-11 14:40:20 +02:00
Vadim Zeitlin
309f942aa6 Merge branch 'qt-build' 
Minor wxQt API fixes and simplifications.

See https://github.com/wxWidgets/wxWidgets/pull/962
 2018-10-07 19:55:37 +02:00
Scott Furry
f8c14d1176 Define more wxToolBar::SetToolXXX() methods in wxQt 
Provide a stub for SetToolShortHelp() and really implement
SetTool{Normal,Disabled}Bitmap().
 2018-10-06 14:07:02 +02:00
Scott Furry
2ea9548ffb Add default argument values to wxToolBar::CreateTool() in wxQt 
Make the API consistent with the other ports.
 2018-10-06 14:06:55 +02:00
Maarten Bent
32d32f8172 Revert "Fix missing wxOwnerDrawn functions in WXQT wxMenuItem" 
This reverts commit 4e23b3e7f4.
wxOwnerDrawn is only used with wxMSW toolkit.
 2018-10-01 21:47:33 +02:00