Commit Graph

66740 Commits

Author SHA1 Message Date
Graham Dawes
78280428e9 Replace use of QTreeWidget::setIcon and QTreeWidget::iconChanged with code that is compatible with our minimum suppported QT version 2019-02-12 08:15:47 +00:00
Catalin Raceanu
fb00507fb5 Implement image support for button states in wxQt
Closes https://github.com/wxWidgets/wxWidgets/pull/1224
2019-02-11 19:34:26 +01:00
Graham Dawes
6ead20624a Fix wxQT wxTreeCtrl drawing issues under Linux 2019-02-11 13:50:55 +00:00
Graham Dawes
8141586102 Correct restoration of tree icon logic 2019-02-11 13:00:42 +00:00
Graham Dawes
8ab2d9c944 Fix incorrect icon being drawn in wxTreeCtrl 2019-02-11 09:08:43 +00:00
Graham Dawes
d0f71da55b Fix build warning 2019-02-11 08:15:37 +00:00
Graham Dawes
5d2663432e Delete child items in wxTreeCtrl::Delete under wxQT 2019-02-11 08:14:25 +00:00
Vadim Zeitlin
bf515d769a Fix size of text drawing using wxGraphicsContext when printing
When using both wxEnhMetaFileDC (used for print preview) and
wxPrinterDC, a global scale factor was applied to the graphics context
in wxGDIPlusPrintingContext ctor and this changes size of the text
rendered using size specified in point units.

To prevent this from happening, stop applying this scale factor in the
base class GetTextExtent() and apply it instead when setting fonts in
the derived wxGDIPlusPrintingContext only. This ensures that the results
are consistent between GetTextExtent() and DrawText() and also keeps
the font scale hack entirely in wxGDIPlusPrintingContext without
affecting the base class.

It's still not totally clear why do we have to do this at all even
although we specify the font sizes in UnitPoint units which ought to be
DPI-independent -- but somehow are not. But at least the output is
correct now and the code is arguably more clear than before.

This fixes a regression with text size when printing or previewing
introduced by d5020362ff

Closes #18338.
2019-02-08 16:49:38 +01:00
Vadim Zeitlin
21661d51d8 Remove unnecessary wxGDIPlusPrintingContext dtor
No real changes.
2019-02-08 16:16:02 +01:00
Graham Dawes
6482664955 Fix build errors when building with gcc 2019-02-08 14:43:04 +00:00
Jay Nabonne
6014eb37ea Fix some stylistic and wxT issues. 2019-02-08 14:04:27 +00:00
Jay Nabonne
8844e16b03 Fix new header. 2019-02-08 14:03:32 +00:00
Jay Nabonne
4cfc55add8 Fix tab/spacing 2019-02-08 13:53:21 +00:00
Jay Nabonne
5e28b51a66 Create a simple implementation of GetBoundingRect. 2019-02-08 11:33:29 +00:00
Jay Nabonne
b0af9a12b6 Mark a virtual function override as such. 2019-02-08 11:32:53 +00:00
Jay Nabonne
b7ff45799c Clean up file. 2019-02-08 10:57:08 +00:00
Jay Nabonne
99e7da303e Clean up code before pull request.. 2019-02-07 17:37:14 +00:00
Jay Nabonne
23f6be20c8 Fix SetItemBackgroundColour. 2019-02-07 17:14:13 +00:00
Jay Nabonne
2a7d0eebcc Implement "hide root" properly. 2019-02-07 16:26:39 +00:00
Graham Dawes
b96cc406f4 Don't add item to tree until its fully constructed (prevents itemChanged signal from firing). 2019-02-07 14:24:52 +00:00
Graham Dawes
3d89c1e9e8 Set old tree item for selection change events. 2019-02-07 14:22:21 +00:00
Graham Dawes
8c87a43f18 Place holder image is only generated once.. 2019-02-07 14:04:21 +00:00
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