Commit Graph

65 Commits

Author SHA1 Message Date
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
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
6f3f38980f Added 'HasAlpha' attribute for wxColourProperty. Setting it to true allows user to edit the alpha component.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 10:14:29 +00:00
Jaakko Salli
780cccd730 Reworked wxSystemColourProperty::StringToValue() to use wxColour::Set() instead of doing string-to-colour conversion by itself. This adds support for HTML-colours, among other things (closes #12696).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-20 11:58:54 +00:00
Jaakko Salli
b3ecee8d12 Also reset DatePicker property editor's global pointer (fixes #11787)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-10 08:32:58 +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
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
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
47450ed137 Fixed assert when editing wxFontProperty with unspecified value (fixes #12086)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-29 10:01:35 +00:00
Paul Cornett
a243da29c8 make array data fully const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-02 17:28:45 +00:00
Jaakko Salli
30fad74e44 Do not use wxS in array of const wxChar*
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-28 06:40:26 +00:00
Jaakko Salli
9867e3e498 wxFontProperty: Added support for wxFONTFAMILY_TELETYPE and wxFONTFAMILY_UNKNOWN, moved Family child-property to the back.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-27 11:44:25 +00:00
Paul Cornett
b4bde7a74b build fixes for wxUSE_VALIDATORS==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-23 16:32:32 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
Jaakko Salli
fbbde24964 Yet another fix for the colour property 'Custom' entry (get drop-down list index directly from wxOwnerDrawnComboBox)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-12 09:59:26 +00:00
Jaakko Salli
eddcc4b442 Added wxPropertyGrid::WasValueChangedInEvent(), added code to avoid showing colour picker dialog twice when 'Custom' colour was picked from drop-down list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-11 07:59:59 +00:00
Jaakko Salli
858102d740 Fixed 'Custom' entry in the colour property combo boxes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-11 07:29:42 +00:00
Jaakko Salli
5f7c24e2ff Further fixes to colour properties that use wxPG_COLOUR_ALLOW_CUSTOM attribute
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-07 15:23:26 +00:00
Jaakko Salli
a4c605ce97 Colour property with attribute wxPG_COLOUR_ALLOW_CUSTOM = false did not render correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-03 14:39:26 +00:00
Jaakko Salli
4e00b90802 Added support for wxLongLong and wxULongLong in wxVariant (closes #10166)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 22:43:27 +00:00
Jaakko Salli
b8b1ff481c Implementations of wxPGProperty::ChildChanged() must now return changed value of the whole property instead of writing it back to 'thisValue' argument. This change was done primarily for better compatibility with wxPython bindings, but should also be slightly more cleaner behavior API-wise. Breaks backwards compatibility, but not silently.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-07 07:52:53 +00:00
Jaakko Salli
9a1eabd485 Fixed fallback font used in wxFontProperty::OnSetValue()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-18 09:56:09 +00:00
Vadim Zeitlin
09777a5bb5 compilation fix after wxDateTime::Parse() changes (but do we really intent to return true here if the string was only partially parsed?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-25 10:27:36 +00:00
Jaakko Salli
48a32cf671 Reworked the way child properties can be added to a property that has not yet been added to a grid or page; AddChild() deprecated, now use AddPrivateChild() instead. For public children, new member functions AppendChild() and InsertChild() should do the job.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-12 18:17:55 +00:00
Jaakko Salli
2728c3bfe7 Added proper COW to wxPGChoices, moved wxPGChoices code from propgrid.cpp to property.cpp (to match header organization), removed some now-unneeded helper functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-04 16:45:23 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-19 13:55:27 +00:00
Jaakko Salli
b6fd0b4245 Better support for unspecified property value in wxDateProperty and DatePickerCtrl editor, especially when wxDP_ALLOWNONE is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-12 17:05:37 +00:00
Jaakko Salli
bfad4a1546 Fixed a VC6 warning (hopefully)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-23 15:33:28 +00:00
Jaakko Salli
18e046a7c5 SpinCtrl editor's 'value change by mouse motion' feature is made optional, enabled via 'MotionSpin' attribute. Also, for now only enabled on MSW (mouse capture etc. inconsistent on native wxGTK spinbutton?).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-11 16:14:55 +00:00
Jaakko Salli
f14ed73f1a Better EVT_MOTION handling in wxPGSpinButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-08 17:20:11 +00:00
Jaakko Salli
8a337f95d8 Implement ability to rapidly change spin value of SpinCtrl property editor by moving mouse while one of the spin buttons is depressed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-02 18:39:40 +00:00
Jaakko Salli
5b4666dfbe DatePickerCtrl editor could crash if property had unspecified or otherwise incompatible value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-24 16:42:53 +00:00
Jaakko Salli
b0996c3da0 Eliminate need to call Connect() in wxPGEditor::CreateControls()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-23 11:00:40 +00:00
Jaakko Salli
591df136d6 When calling DrawIconEx(), do not use DI_COMPAT or DI_DEFAULTSIZE on WinCE (fixes ticket #10200)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-19 16:29:47 +00:00
Paul Cornett
b7bc9d806b cleanup: unreachable code, unused variables, indentation, etc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-16 18:20:46 +00:00
Vadim Zeitlin
85b6f1c431 remove unused static wxColourFromPGLong function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-14 23:32:20 +00:00
Vadim Zeitlin
9e996d8c43 remove useless comparison of unsigned value with 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-14 23:31:37 +00:00
Jaakko Salli
b0f0eda8ce Fix various warnings that only appear for release builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-01 16:49:32 +00:00
Jaakko Salli
cfcc02a8a4 Removed dummy wxFont == operator implementation (IIRC was needed to compile with some old version of wx)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-27 16:26:46 +00:00
Jaakko Salli
78f2d746a0 Merged wxBaseEnumPropertyClass (intermediate property class with obsolete purpose) to wxEnumPropertyClass
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-22 15:23:07 +00:00
Jaakko Salli
98c0463399 Removed deprecated functions wxPGChoices::HasValue(), HasValues()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-21 15:17:06 +00:00
Jaakko Salli
404b9c623a Changed argument of wxPropertyGrid::OnCustomEditorEvent() from wxCommandEvent to wxEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-19 11:48:49 +00:00
Jaakko Salli
c904964610 Fixed wxSystemColourProperty::ValueToString(). It now once again properly formats custom colour selection as (R, G, B) when displayed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-19 11:16:29 +00:00
Jaakko Salli
102c9a42e8 Fixed broken wxMultiChoiceProperty::ValueToString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-16 17:36:07 +00:00
Jaakko Salli
1425eca550 Added virtual wxPGProperty::ValueToString(). In derived property classes, now it must be implemented instead of GetValueAsString (assertion failure is raised at run-time if you fail to do so). This change is needed to properly support wxEVT_PG_CHANGING for nested composite string properties. wxPGProperty::GenerateComposedValue() partially updated to support this.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-16 17:19:50 +00:00
Jaakko Salli
2fd4a52415 wxPGProperty::AddChild() can now be used to add normal child properties (previously it was only used to add private children of derived property classes such as wxFontProperty and wxFlagsProperty). However, to allow backwards compatibility, SetParentalStyle(wxPG_PROP_MISC_PARENT) needs to be called before doing so. Also done: merged property initialization code from PrepareToAddItem() and PrepareSubProperties() to InitAfterAdded().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-14 17:15:59 +00:00
Jaakko Salli
703ee9f5ec GetPendingEditedValue() -> GetUncommittedPropertyValue() (more consistent API naming. Eg. there is also CommitChangesFromEditor())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-10 15:22:08 +00:00
Jaakko Salli
9b5bafcf38 Removed dysfunctional wxPGPropery::PrepareValueForDialogEditing(); Replaced its functionality with wxPropertyGrid::GetPendingEditedValue(); Added wxPropertyGrid::PerformValidation() flags so it can be called in generic context.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-08 18:15:10 +00:00
Jaakko Salli
d61d8cffa9 Eliminated last property generation macros from props.h (colour property gen ones, now use subclassing facilities present in wx(System)ColourProperty)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-07 17:28:05 +00:00
Jaakko Salli
52cefafe7e Minimize use of editor class macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-06 16:09:36 +00:00