Commit Graph

66518 Commits

Author SHA1 Message Date
Graham Dawes
281673a584 Merge branch 'qt_tree_control' of https://github.com/GeoTeric/wxWidgets into qt_tree_control 2019-02-07 13:49:17 +00:00
Graham Dawes
d597787270 Store item state in wxTreeCtrl for wxQT 2019-02-07 13:46:20 +00:00
Graham Dawes
d8c3a14eee Generate wxEVT_TREE_END_LABEL_EDIT when the user has finished editing an item in wxTreeCtrl 2019-02-07 13:34:10 +00:00
Jay Nabonne
9566143b58 Get rid of logic error - no need for state variables and all that, by just doing things at the right time.
This fixes the problem of the mouse position being wrong during endDrag.
2019-02-07 12:05:34 +00:00
Jay Nabonne
d3033c861c Merge branch 'qt_tree_control' of https://github.com/GeoTeric/wxWidgets into qt_tree_control 2019-02-07 11:40:28 +00:00
Jay Nabonne
6dfc243b27 Fix up a comment. 2019-02-07 11:39:26 +00:00
Jay Nabonne
541e7af374 Fix wx drag events to actually be keyed off of the Qt dragging state instead of its "drop" events.
Add "dropped" state to track whether a drop actually occurred or whether the drag ended unsuccessfully.
2019-02-07 11:36:15 +00:00
Graham Dawes
5aba98353c Generate event when begin editing tree item. 2019-02-07 10:27:51 +00:00
Jay Nabonne
5279d0bca5 Clean up the code after merges. 2019-02-07 10:13:05 +00:00
Graham Dawes
0356b236c8 Merge branch 'qt_tree_control' of https://github.com/GeoTeric/wxWidgets into qt_tree_control 2019-02-07 10:04:44 +00:00
Jay Nabonne
3c3421b3b2 Merge branch 'qt_tree_control' of https://github.com/GeoTeric/wxWidgets into qt_tree_control
# Conflicts:
#	src/qt/treectrl.cpp
2019-02-07 10:01:40 +00:00
Jay Nabonne
d9080cd791 Get initial tree control drag and drop working. Create a new type for tree item data, as it needs to be serialisable for drag and drop, and void* is not. 2019-02-07 09:08:08 +00:00
Jay Nabonne
e8d39f3b5c No buttons image list support for Qt as for MSW. 2019-02-07 08:58:38 +00:00
Graham Dawes
9ba41aecc1 Fix build warnings in wxTreeCtrl 2019-02-07 08:43:31 +00:00
Graham Dawes
3342695b92 Make wxQT wxTreeCtrl selection behave consistently with other wx ports. 2019-02-07 08:39:04 +00:00
Graham Dawes
ab6f8e5092 Prevent "header" row from showing in wxTreeCtrl under wxQT. 2019-02-06 16:49:43 +00:00
Graham Dawes
02d47aadfd Fix wxTreeCtrl::GetSelections for wxQT 2019-02-06 13:23:17 +00:00
Graham Dawes
d2f1e1b61b Better support for images in wxTreeCtrl under wxQT 2019-02-06 12:55:30 +00:00
Graham Dawes
57348b4a59 Add EditControl support for wxTreeCtrl under wxQT 2019-02-06 09:20:13 +00:00
Graham Dawes
cfe36f7ae7 Move wxQtTreeItemEditorFactory to its own header 2019-02-06 08:57:29 +00:00
Graham Dawes
dee221e2a5 Rename wxQtItemEditorFactory to wxQtTreeItemEditorFactory 2019-02-06 08:32:41 +00:00
Vadim Zeitlin
9a9ff29098 Remove redundant wxUSE_XXX checks from wx/filesys.h
These checks are already performed in wx/chkconf.h and don't need to be
redone here, especially incorrectly (testing for "!wxUSE_FILESYSTEM"
inside "#if wxUSE_FILESYSTEM" is useless).
2019-02-05 21:03:27 +01:00
Graham Dawes
c7f77ba765 Add signal handlers to generate wx events for wxTreeCtrl under wxQT 2019-02-05 19:50:16 +00:00
Graham Dawes
c87e959a4a Add test for wxTreeCtrl::GetItemCount() 2019-02-05 19:49:36 +00:00
Graham Dawes
9df2258397 Fix some failing TreeBookCtrl tests cases 2019-02-05 19:05:40 +00:00
Graham Dawes
2a91c00c10 Add missing d'tor 2019-02-05 16:13:56 +00:00
Graham Dawes
9f1f8636c5 Fix root relationship 2019-02-05 14:15:36 +00:00
Graham Dawes
8efe01bd8e Implement basic styles for wxTreeCtrl under wxQT 2019-02-05 13:46:32 +00:00
Graham Dawes
308ef18a6d Start "native" implementation of wxTreeCtrl for wxQT 2019-02-05 13:23:12 +00:00
Graham Dawes
eb00d7623a Rename internal tree widget to something more appropriate for
a wxListCtrl.
2019-02-05 08:06:26 +00:00
Graham Dawes
5ec25fe755 Implement support for wxFrame style flags for wxQt
Closes https://github.com/wxWidgets/wxWidgets/pull/1222
2019-02-05 03:06:05 +01:00
Vadim Zeitlin
153b5e85fb Merge branch 'qt_combobox_crash' of https://github.com/GeoTeric/wxWidgets
Fix crashes when using wxCB_READONLY in wxQt.

See https://github.com/wxWidgets/wxWidgets/pull/1221
2019-02-05 03:04:21 +01:00
Vadim Zeitlin
ddc550105e Merge branch 'qt-radio-groups'
Fix radio button grouping in Qt.

See https://github.com/wxWidgets/wxWidgets/pull/1212
2019-02-05 03:03:10 +01:00
Vadim Zeitlin
33998fb7eb Merge branch 'ci-sample' of https://github.com/MaartenBent/wxWidgets
Improve building samples with CI.

See https://github.com/wxWidgets/wxWidgets/pull/1218
2019-02-04 11:24:28 +01:00
Scott Talbert
cdb7241995 Document wxLocaleInitFlags
Closes https://github.com/wxWidgets/wxWidgets/pull/1216
2019-02-04 11:23:18 +01:00
Vadim Zeitlin
47c5eacc93 Merge branch 'gc-get-text-extent'
Micro-optimization in wxGDIPlusContext::GetTextExtent() and minor
printing sample cleanup.

See https://github.com/wxWidgets/wxWidgets/pull/1220
2019-02-04 11:20:59 +01:00
Graham Dawes
a60c2470b5 Dedupe wxCB_READONLY check 2019-02-04 09:26:10 +00:00
Graham Dawes
1472b2f8ef Fix crashes with readonly combobox under wxQT 2019-02-04 09:23:08 +00:00
Vadim Zeitlin
679decd81d Merge branch 'disable-sdl-macos'
Disable the use of SDL under macOS, it doesn't compile nor is needed
there.

See https://github.com/wxWidgets/wxWidgets/pull/1217
2019-02-03 22:54:32 +01:00
Vadim Zeitlin
606659d27c De-TAB-ify configure
No real changes, just remove the hard TABs.
2019-02-03 22:52:43 +01:00
Vadim Zeitlin
b1057cad05 Also disable SDL under macOS for configure-based builds
SDL-based wxSound backend doesn't currently compile under macOS and is
probably not very useful there anyhow.
2019-02-03 22:51:10 +01:00
Vadim Zeitlin
c08ea68b4a Avoid unnecessary calls in wxGDIPlusContext::GetTextExtent()
Don't always call several GDI+ functions when we often don't need their
results: only retrieve the cell descent, ascent and the line spacing if
we are going to really use any of these values.
2019-02-03 22:46:02 +01:00
Vadim Zeitlin
21a7ff2aa3 Use wxScopedPtr instead of explicit delete in printing sample
No real changes, just make the code a bit safer.
2019-02-03 22:45:46 +01:00
Vadim Zeitlin
7a05aa6dc0 Don't pass unused arguments to GetTextExtent() in printing sample
No real changes, just remove the completely unused local variables and
parameters to wxGraphicsContext::GetTextExtent() call.
2019-02-03 22:42:55 +01:00
Vadim Zeitlin
efa1e8f4ff Merge branch 'gc-from-unknown-dc'
Add wxGraphicsRenderer::CreateContextFromUnknownDC().

See https://github.com/wxWidgets/wxWidgets/pull/1213
2019-02-03 22:14:01 +01:00
Maarten Bent
d111053151 Use CMake script to check Travis installation 2019-02-03 21:51:50 +01:00
Maarten Bent
6be0e7749c CMake: don't search SDL on macOS
It doesn't compile when enabled.
2019-02-03 19:01:00 +01:00
Maarten Bent
ea2c8543d3 Build some samples on AppVeyor with CMake
Remove unused toolsets.
Remove extra popd.
2019-02-03 19:00:03 +01:00
New Pagodi
91d3981a7b Implement BitmapFromRGBAImage without raw bitmap
The function BitmapFromRGBAImage in PlatWX.cpp is currently only
used when wxHAS_RAW_BITMAP is defined. Consequently some functions in
PlatWX.cpp simply do nothing when wxHAS_RAW_BITMAP is not defined. This
provides a second implementation of the function based on wxImage that
is used when wxHAS_RAW_BITMAP is not defined.
2019-02-02 17:45:30 -06:00
New Pagodi
ebdc838151 Preserve recent changes to wxSTC documentation
Recent commits 8fbca5cb70 and c68e5d0617 fixed some typos is the
documentation for wxSTC. Unfortunatly these changes will be lost the
next time the wxSTC files are regenerated. This commit modifies
stc.interface.h.in and gen_docs.py to ensure that these changes are
preserved when the wxSTC files are regenerated.
2019-02-02 17:45:29 -06:00