Commit Graph

183 Commits

Author SHA1 Message Date
Dimitri Schoolwerth
6636ef8ddf Use wxString's empty() when checking if the string is (non-)empty throughout wx.
Instead of constructs such as if "( s.length() )" and "if (s.length() > 0)" use "if ( !s.empty() )" instead. Similarly for "if (s.length() == 0)" or "if ( s.IsNull() )", use "if ( s.empty() )".
No code changes intended except for a few instances where a construct like "if ( s.length() && wxFileExists(s) )" was changed to not check the length of the string and let wxFileExists handle such cases.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-22 14:38:36 +00:00
Jaakko Salli
abbd88b52b Added wxPG_ACTION_EDIT, which allows specifying custom key to move focus to the property editor. Also documented wxPG_ACTION_FOOs better.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 17:25:45 +00:00
Jaakko Salli
5569834ddb Fix 100% CPU usage on wxGTK caused by a recent change in wxPropertyGridEditorEventForwarder::ProcessEvent()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-26 17:39:47 +00:00
Jaakko Salli
b296009869 Have wxPropertyGridEditorEventForwarder::ProcessEvent() return true more often - that is when the event was recognized as being 'handled', and specifically for the case of property editor's button being pressed (fixes #12487).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 14:28:16 +00:00
Jaakko Salli
769ede722a Call wxScrollHelper::AdjustScrollbars() to fix scroll bar setup that broke after wxPropertyGrid was changed to inherit from wxScrollHelper instead of wxScrolledWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-18 13:55:40 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace.
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:44:45 +00:00
Jaakko Salli
1e005ad1fd Reset wxPGEditor singleton instance pointers in dtors. This is useful if wxPropertyGrid is being accessed from an external main loop.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-28 18:59:41 +00:00
Jaakko Salli
36b7e3a2ec Correct empty space drawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-24 17:44:20 +00:00
Jaakko Salli
fb296a697d Removed debug log message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-24 17:40:06 +00:00
Jaakko Salli
2e2e62def1 Have wxPropertyGrid inherit from wxControl and wxScrollHelper instead of wxScrolledWindow. This is the approach other scrolled controls use.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-24 14:47:20 +00:00
Jaakko Salli
c27615f55c Streamline wxPropertyGrid tooltip code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 12:58:02 +00:00
Jaakko Salli
b89b24691e Call SetToolTip() for the property editor control when wxPG_EX_HELP_AS_TOOLTIPS style is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 15:38:12 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Jaakko Salli
f18b71b07e Do not run focus detection when handling events from editor control (mostly because they may be showing a dialog)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-10 15:40:33 +00:00
Jaakko Salli
72e8179f26 Include scopeguard.h for wxON_BLOCK_EXIT_SET()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-09 15:17:21 +00:00
Jaakko Salli
88f47aa770 Make m_inDoPropertyChanged and m_inCommitChangesFromEditor bools; Manage m_inDoPropertyChanged using wxON_BLOCK_EXIT_SET()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-04 11:21:27 +00:00
Jaakko Salli
96bffa1288 m_inDoSelectProperty: make it bool and use wxON_BLOCK_EXIT_SET() on it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-04 10:30:13 +00:00
Jaakko Salli
03d47fcf07 Redundant wxPropertyGrid validation failure message boxes should no longer be shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-04 09:46:43 +00:00
Jaakko Salli
8923cccda4 Translate text 'Property Error'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-04 08:33:16 +00:00
Jaakko Salli
0ea0604a1e Added new wxPropertyGrid property validation failure flags wxPG_VFB_SHOW_MESSAGEBOX and wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR, which allow defining the default message display behavior more accurately
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-04 08:22:52 +00:00
Jaakko Salli
2d8d109b6c Eliminated lingering validation failure message on the status bar. Added wxPropertyGrid virtual member functions DoHidePropertyError() and GetStatusBar().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-03 12:22:58 +00:00
Jaakko Salli
8915141c1e wxPropertyGrid validation failure was not (always) reset when a valid value was entered after an invalid one.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-03 11:43:49 +00:00
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +00:00
Jaakko Salli
bb9da4d3ca For wxTextCtrl editor, set the bold font before margins are set up or it will not work properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-12 10:31:24 +00:00
Jaakko Salli
372d0bdd67 Keyboard handling was blocked by label editor. Also try to maintain label editor focus state when navigating between properties.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-12 09:47:25 +00:00
Jaakko Salli
8d2c70414c Added wxPropertyGrid::DedicateKey(), which prevents specific key presses from being eaten by editor controls. This is useful for customizing keyboard navigation. Also added utility function wxPGFindInVector<>(), which is used in the new code, and also in some other places.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-12 09:30:57 +00:00
Jaakko Salli
cc98c78510 In wxPropertyGrid::DoPropertyChanged(), call GetEditorControl() as late as possible so that editor can be changed in wxPGProperty::OnSetValue() (fixes #11987)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-24 10:02:25 +00:00
Jaakko Salli
e954958f98 For better support of wxValidators, invoke wxValidator::Validate() directly. Also remove obsolete flag wxPG_FL_VALIDATION_FAILED and make wxPropertyGrid::DoEditorValidate() virtual.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-29 18:17:55 +00:00
Jaakko Salli
18e543ea9d Fix focus at the end of a property label edit (needed at least for wxGTK)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-25 15:55:01 +00:00
Jaakko Salli
ad2db6f8ea In wxPropertyGrid::HandleCustomEditorEvent(), ignore events coming from a label editor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-25 15:40:27 +00:00
Jaakko Salli
e948e2140f Fixed RefreshRect() call in wxPropertyGrid::DrawItems() to use physical window coordinates instead of logical grid ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-22 16:07:45 +00:00
Vadim Zeitlin
636d5f3f23 Remove duplicate variable definition.
The splitterX variable in wxPropertyGrid::HandleMouseMove() was defined twice
with the same value, remove the second definition to avoid warnings about
shadowing the variable in outer scope from some compilers.

See #11817.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-20 12:45:19 +00:00
Jaakko Salli
be7e10393a Fixed label editor position for child properties
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-14 17:15:17 +00:00
Jaakko Salli
d2a82a6f7d Added work around in wxPropertyGrid for a wxTextCtrl beep on enter press
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-25 15:05:09 +00:00
Jaakko Salli
48567d2790 Set up default property grid unspecified value colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-23 15:29:10 +00:00
Jaakko Salli
f231df8aa8 Property removal and deletion done from wxPropertyGrid event handler is now postponed to idle event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-22 16:44:56 +00:00
Jaakko Salli
76733d4cae Fixed auto-resizing behavior when double-clicking a splitter; Added wxPropertyGrid::ResetColumnSizes(); wxPropertyGrid::GetSplitterPosition() got splitterIndex argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-16 16:24:30 +00:00
Jaakko Salli
7261371b17 Do not clear property selection when adding new properties, but instead correct positions of any open editor controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-02 15:19:41 +00:00
Jaakko Salli
34c921fc4d Fixed value column rendering for properties which do not create editor control when selected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-31 18:13:13 +00:00
Jaakko Salli
d5df4df90a Added missing ResetEditorAppearance() call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-03 10:24:12 +00:00
Jaakko Salli
e16bff8e62 Changed wxPropertyCategory to use same cell rendering code as regular properties. This allows labels for category columns other than the first. Rendering code was heavily modified to allow 'merging' of cells when needed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-29 16:04:40 +00:00
Jaakko Salli
534090e354 Replaced 'InlineHelp' property attribute with 'Hint'; Use SetHint() wxTextCtrl and wxComboCtrl member function to set it; Added a small section about help string and hint text in propgrid overview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-26 10:45:04 +00:00
Jaakko Salli
3e6d8c3118 Added wxPropertyGrid::SetUnspecifiedValueAppearance(); Added wxPGEditor::SetControlAppearance() for applying wxPGCell attributes on a property editor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-22 16:12:02 +00:00
Jaakko Salli
68174df30e Added wxPropertyGrid::GetUnspecifiedValueText(). Use it instead of assuming that the unspecified value text is always an empty string.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-20 12:48:41 +00:00
Jaakko Salli
bc0f253462 Properly notify active editor control when it receives the focus.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-19 12:08:00 +00:00
Jaakko Salli
3020453f5a In wxPropertyGrid::HandleCustomEditorEvent(), also filter out excess wxEVT_COMMAND_TEXT_UPDATED events that originated from wxComboCtrl-derived editors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-19 11:13:03 +00:00
Jaakko Salli
bca35e84c0 Allow wxPropertyGrid::RecalculateVirtualSize() execute even if pg is not completely initialized (otherwise virtual size calculations may go wrong)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-17 14:41:57 +00:00
Jaakko Salli
1bc74ec9b7 Slightly improved check whether or not to execute wxPropertyGrid::RecalculateVirtualSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-16 18:48:42 +00:00
Jaakko Salli
46fa86f720 Make wxPG_EX_MULTIPLE_SELECTION behave more like a Windows list box (regarding Ctrl and Shift keys)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-14 16:13:21 +00:00
Jaakko Salli
f525476870 Added wxPropertyGridManager header support; Refactored wxPropertyGrid DoSetSplitterPosition() code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-13 12:00:04 +00:00