Commit Graph

419 Commits

Author SHA1 Message Date
Artur Wieczorek
a029ac7690 Revert "Add wxABI_VERSION guard around wxFloatProperty::DoGetAttribute virtual method body."
This reverts commit 192a61b391.
2015-05-27 22:12:37 +02:00
Artur Wieczorek
192a61b391 Add wxABI_VERSION guard around wxFloatProperty::DoGetAttribute virtual method body.
To prevent compilation errors (when wxABI_VERSION < 30003) also the body of newly overridden method needs to be guarded by wxABI_VERSION.
(See 7b25b65a2f).
2015-05-27 19:43:23 +02:00
Artur Wieczorek
82106a9d9e Allow use of all wxPG colours.
Restore original list of wxPG-specific colours. wxPG-specific colours are added to the colour database when wxColourProperty is created (already existing colours are not overwritten by wxPG ones).

This is the backport of r76893 and r76894.
See #15597.
2015-02-22 22:50:45 +01:00
Artur Wieczorek
a3735c8cc1 When drawing wxPG items (with double buffering) use the same layout direction as the window uses.
Memory DC used for double buffering purposes should inherit layout direction from the window DC to ensure that texts are rendered correctly.

This is the backport of r76931.
See #15797.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-16 20:50:07 +00:00
Artur Wieczorek
63e678d978 Fix saving edited property value when wxPG property is in the 'invalid value' state.
When wxPGProperty is loosing focus in 'invalid value' state its pending value should be stored before resetting property to 'normal' state because this operation (wxPG::OnValidationFailureReset) also resets pending value.

This is the backport of r77887.
See #16587.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-16 20:38:33 +00:00
Artur Wieczorek
e268d561a6 Fix vertical positioning of text field in the combo box editor associated with wxPG property under wxMSW.
Vertical position of text field in wxOwnerDrawnComboBox control (instantiated at property selection) doesn't need any special adjustment.

This is a backport of r77687.
See #16556.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2015-02-01 11:14:34 +00:00
Vadim Zeitlin
b01e333f89 Fix several rounding problems with float values in wxPropertyGrid.
See also r85980 in the trunk.

Closes #15625.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-06 12:35:25 +00:00
Vadim Zeitlin
fb79efd531 Send events when toggling wxPropertyGrid nodes from keyboard.
Closes #15899.

[This is the backport of r75665 from trunk.]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-03 01:52:24 +00:00
Vadim Zeitlin
e18d66b9b5 Fix cancelling choice of custom colour in wxPropertyGrid.
When using wxPGEditor_Choice colour property, cancelling the choice of the
custom colour reset the previously selected custom colour.

Fix this by correcting the test for the custom colour which didn't work
before.

Closes #15542.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-30 16:34:31 +00:00
Vadim Zeitlin
a52b9b5715 Avoid showing the colour selection dialog twice in wxPropertyGrid.
Selecting "Custom" in a colour property cell resulted in the colour selection
dialog being shown twice if it was cancelled the first time.

Fix this by using wxPG_PROPERTY_SPECIFIC to indicate that the value is just
being queried and the user shouldn't be asked to enter it, as it is already in
the other places.

Closes #15543.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-22 14:15:05 +00:00
Vadim Zeitlin
135dcbe4c3 Fix querying the value of wxEnumProperty in wxPropertyGridEditor.
Doing this changed the internal state of the control and resulted in the
choice not being updated.

Fix this by using wxPG_PROPERTY_SPECIFIC.

Closes #15449.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:28:25 +00:00
Paul Cornett
7d8501c892 build fix for wxUSE_VALIDATORS==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-11 15:53:41 +00:00
Vadim Zeitlin
cdcb63bf18 Fix fallback format index in wxPropertyGetter wxUIntProperty code.
Don't crash by accessing an out of bands array element if the format string
index had been set to an invalid value, just use the default (decimal) format
in this case.

Closes #15984.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-17 23:55:08 +00:00
Vadim Zeitlin
9ff8e5534b Use symbolic constants in wxPropertyGrid wxUIntProperty code.
No real changes, just use symbolic constants instead of hard coded magical
constants. The code is still difficult to understand but slightly better than
before.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-17 23:55:05 +00:00
Vadim Zeitlin
991e4a9c0f Ignore system colour change events in not yet initialized wxPropertyGrid.
Handling these events before the initialization was over could result in a
crash because m_categoryDefaultCell wasn't yet initialized when the window was
created. Fix this by ignoring these events during initialization.

Closes #15642.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-05 13:39:53 +00:00
Vadim Zeitlin
26c7a01f1d Remove wxPropertyGrid colours not recognized by wxColour.
Don't use colour names which can't be used to successfully initialize
wxColour.

This is not the best solution, we probably should add these names to the
colour database instead, but for now it's better than getting errors when
trying to use these colours for colour properties in wxPropertyGrid.

See #15597.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-25 17:51:16 +00:00
Vadim Zeitlin
0d17c5b66a Improve composite flags handling in the property grid wxFlagsProperty.
Don't consider that a flag is on just because one of its bits is enabled in
the current flags, for the composite flags (e.g. something like "BOTH = ONE |
TWO") all the bits composing the flag must be on for it to be enabled.

Closes #15499.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-15 00:14:41 +00:00
Vadim Zeitlin
8cf4b0651f Initialize wxImageFileProperty correctly when file is given in the ctor.
Previously the file had to be specified later and the value passed to the ctor
was ignored.

Closes #15456.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-29 20:44:58 +00:00
Vadim Zeitlin
33d953e748 Add wxPropertyGridPageState::GetColumnFullWidth().
This method allows to get the full width needed by wxPropertyGrid and is
useful for determining the space to allocate for it, e.g. when creating a
popup showing the property grid, as shown by the changes to the sample.

Closes #15368.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-06 13:05:42 +00:00
Vadim Zeitlin
9869c26285 Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.
Return the real height instead of -1.

Closes #15367.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-06 13:05:36 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Robin Dunn
58d1949f8c Call InitializeModules instead of just module->Init(). This is needed so the module will have the proper state and not cause an assert when the modules are cleaned up. Since InitializeModules will skip any that are already initialized it doesn't hurt to call it for modules loaded later.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-07 21:09:31 +00:00
Vadim Zeitlin
ce7fe42e84 Provide shorter synonyms for wxEVT_XXX constants.
Use the same short names as are used by the event table macros for the event
type constants themselves. This makes them much more comfortable to use, e.g.
Bind(wxEVT_BUTTON) compared to Bind(wxEVT_COMMAND_BUTTON_CLICKED).

The old long names are still kept for backwards compatibility and shouldn't be
removed as it doesn't really cost anything to continue providing them, but all
new event types should only use the short versions.

Closes #10661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-25 10:11:03 +00:00
Vadim Zeitlin
0ed8f52acd Put "#if wxUSE_TOOLBAR" around a variable only used in this case.
No real changes.

Closes #14957.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-20 02:09:27 +00:00
Paul Cornett
51623cc53f remove unused variable assignment, closes #14928
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 17:04:01 +00:00
Paul Cornett
63a4b41eda fix consruction of string
thanks to clang for finding this one

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-26 17:32:38 +00:00
Vadim Zeitlin
d57d0505d4 Update header control when wxPropertyGridManager is resized.
Closes #14762.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-19 22:03:47 +00:00
Paul Cornett
7d1214cd72 silence warnings about shadowed variables with GCC -Wshadow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-04 15:55:06 +00:00
Vadim Zeitlin
70680b6177 Use SelectAll() instead of SetSelection(-1, -1).
The former is more clear and also shorter.

Closes #14701.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-27 22:41:09 +00:00
Vadim Zeitlin
f33230391a Fix spelling in the comments in wxPropertyGrid code.
No real changes.

Closes #14645.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-14 22:26:54 +00:00
Vadim Zeitlin
9e4587114b Avoid unused variable warning in wxPropertyGrid code in non-wxGTK.
Put the variable only used in wxGTK inside "#ifdef __WXGTK__".

This fixes the warning but the real fix would be to get rid of this variable
completely and just fix whatever problem in wxWindow::Navigate() this was
supposed to work around.

See #14459.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:40 +00:00
Vadim Zeitlin
80a4659776 Use wxCLASSINFO() instead of deprecated CLASSINFO().
No real changes, just use the version of the macro with a "wx" prefix.

Closes #14356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:24 +00:00
Vadim Zeitlin
345c78ca5f Use wxDynamicCast() instead of IsKindOf() checks.
wxDynamicCast() is less verbose (due to the absence of "CLASSINFO") and more
compatible with the standard dynamic_cast<>, so prefer to use it when possible.

See #14356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:18 +00:00
Vadim Zeitlin
7e8a20edc8 Remove unneeded dynamic cast in wxPropertyGrid.
It's completely useless to check that an object is of its own statically
declared type as this is always true, simply don't do it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:12 +00:00
Julian Smart
216b59c66a Added wxPropertyGridManager::SetPageSplitterLeft
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-18 20:35:01 +00:00
Julian Smart
26412151db When SetSplitterLeft measures all pages, it should also set the splitter for all pages.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-07 12:21:20 +00:00
Julian Smart
990952304c Improved the appearance of the property grid checkbox on Mac and GTK+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 18:52:38 +00:00
Vadim Zeitlin
de75a255e5 Never refresh controls from EVT_PAINT handler in wxPropertyGrid.
Refreshing the controls after finishing repainting the grid results in an
infinite stream of paint events, so don't do this, especially as this doesn't
seem to have any bad consequences under wxGTK which was the only major
platform where this behaviour was enabled.

Also rename wxPG_REFRESH_CONTROLS_AFTER_REPAINT to just wxPG_REFRESH_CONTROLS
and keep the control refreshing code for wxGTK only in a couple of places
outside of EVT_PAINT handler to be on the safe side.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 01:20:00 +00:00
Vadim Zeitlin
2d5409f936 Add a property to configure file property dialog kind.
Add wxPG_FILE_DIALOG_STYLE allowing to pass wxFileDialog style that should be
used by the given wxFileProperty. This notably allows to have file properties
accepting not yet existing files, as is needed when using them for the file
names to be saved, not opened.

Closes #13894.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 13:59:52 +00:00
Vadim Zeitlin
9edd688dd3 Ensure that wxPropertyGrid::m_tlp is initialized early enough.
This member variable could be used before it was initialized as
OnTLPChanging() was called from Create() before Init2(), where m_tlp was
assigned NULL, was called.

Closes #13552.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-15 00:22:48 +00:00
Vadim Zeitlin
b82f92a80c Merge similar but not quite identical translated strings.
Some translated strings appeared several times in almost but not quite
identical form. Remove a few of them so that they don't have to be translated
multiple times.

Closes #13637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:43 +00:00
Vadim Zeitlin
5c79993559 Fix format specifiers used for "unsigned long" in wxPG code.
"unsigned long" quantities must be formatted using "%l[xou]" and not just
"%[xou]" as the latter doesn't work correctly on 64 bit platforms.

Closes #13447.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:15 +00:00
Robin Dunn
4f8870e337 Avoid infinite recursion on Mac in comboctrl, and fix an uninitialized pointer in propgrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-05 20:08:04 +00:00
Vadim Zeitlin
026f3f9bc3 Fix warnings about implicit double to int conversions in propgrid.
Use wxRound() instead of implicit casts to convert double to int. This not
only avoids warnings (e.g. when using g++ with -Wconversion) but also should
be (marginally) more precise.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 16:43:40 +00:00
Jaakko Salli
1d8340b956 Allow wxPGProperty::IsChildSelected() to work recursively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-20 14:26:17 +00:00
Jaakko Salli
a6ca624a27 Fixed a bug: Disabling a property didn't work properly if a child item was selected.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-09 19:44:40 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Dimitri Schoolwerth
e3778b4d9c No code changes, fixed some typos.
Changed several occurrences of "it's" where "its" is meant, as well as a few other minor typos.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-30 10:57:04 +00:00
Jaakko Salli
35f8ae6572 Removed wxPG_DOUBLE_BUFFER constant. Now all wxPG rendering is done double-buffered, regardless of the platform. Code path with wxPG_DOUBLE_BUFFER = 0 did not render correctly (fixes #13140). In future should probably use wxAutoBufferedPaintDC or something similar, but this will require non-trivial code changes and testing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-15 09:23:23 +00:00
Jaakko Salli
b718a533ac wxEVT_COMMAND_TEXT_UPDATED events from wxComboCtrl's embedded wxTextCtrl kept confusing wxPropertyGrid::HandleCustomEditorEvent(). We need to ignore them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-13 16:39:06 +00:00