Commit Graph

58840 Commits

Author SHA1 Message Date
Artur Wieczorek
bf01f0e791 Search through all properties in wxPG::GetPropertyByLabel.
Function should search for given label through all properties. This is consistent with searching by name (in GetPropertyByName) which is not limited to the subset of properties.

Closes #15251.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 17:35:59 +00:00
Artur Wieczorek
1a2983d433 Resolve ambiguity in multiple inheritance of function GetPropertyByLabel in wxPGPage.
In wxPropertyGridPage class derived from wxPropertyGridPageState and wxPropertyGridInterface, function GetPropertyByLabel is inherited from both base classes.
To resolve this ambiguity, function defined in wxPGInterface is introduced in wxPGPage through 'using-declaration'.
(This is a temporary fix and finally GetPropertyByLabel function should be removed from wxPropertyGridPageState.)

See #15251.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 17:18:58 +00:00
Stefan Csomor
cc48521426 forgotten commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 17:15:59 +00:00
Stefan Csomor
a5d8826def removing extraneous parentheses
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 16:36:58 +00:00
Stefan Csomor
e144fe614c adding standard options for OS compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 16:27:01 +00:00
Stefan Csomor
693452be18 using in place swapping macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 16:03:41 +00:00
Stefan Csomor
c6201f2d70 completing in place swapping macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 16:03:03 +00:00
Stefan Csomor
14c736b89b fixing commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 15:50:13 +00:00
Stefan Csomor
b8c3fc0771 adding in place replacements avoiding self assignment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 15:42:34 +00:00
Stefan Csomor
c87149d7df attempt at getting rid of unused-function warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 15:37:21 +00:00
Stefan Csomor
7da8c0e080 trial build with special warnings ON
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 13:57:44 +00:00
Vadim Zeitlin
de291b2be1 Shorten wxOSX builds labels.
Too long labels made some of the buildbot tables quite unreadable, so shorten
them to something more reasonable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 11:38:18 +00:00
Stefan Csomor
8219223d0e adding CoreText to iOS builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 10:25:24 +00:00
Stefan Csomor
0515b6e30d adding separate trunk fir c++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-14 09:37:04 +00:00
Artur Wieczorek
3c483f6739 Use native renderers in wxPG under MSW by default.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 16:38:19 +00:00
Artur Wieczorek
f1c25a7838 Use native renderer for drawing check boxes in wxPG only if wxPG_USE_RENDERER_NATIVE flag is set.
wxPG_USE_RENDERER_NATIVE flag is used in wxPG code to control whether  native renderers can be called and we need to employ it. Legacy custom drawing code is used if this flag is no set.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 16:34:42 +00:00
Vadim Zeitlin
45adc64f9f Fix inserting an element of wxArrayString itself back into it.
Do the insertion/addition before deallocating the old memory to allow things
like array.Add(array[0]) to work correctly.

Closes #2290.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 14:30:22 +00:00
Vadim Zeitlin
86e587a096 Fix memory leak in ArraysTestCase unit test.
Clear the items in PTR array explicitly, this is not done by the array itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 14:30:14 +00:00
Vadim Zeitlin
bffc6bc753 Fix socket leaks in wxFTP if starting up/downloading fails.
Add the missing delete statements.

Closes #2250.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 13:53:06 +00:00
Vadim Zeitlin
446ff08ebb Don't DLL-export the private wxSimpleFontEnumerator class.
This class is only used internally, so there is no need to export it from the
shared library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 12:22:26 +00:00
Vadim Zeitlin
61dfb42b6e Use dictionary sort for wxListBox strings.
This should result in more expected, and more consistent with MSW, order of
the items differing in case only.

Also do the same for wxChoice in wxGTK1.

Closes #16356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 12:17:16 +00:00
Julian Smart
2d88120f54 Fix for context menu key under wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 08:52:02 +00:00
Julian Smart
aee4a52e64 Fix for text parsing when the text object has properties
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 08:47:41 +00:00
Julian Smart
6eec9dda58 Layout fix for paragraphs after floating objects not centering
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-13 08:44:22 +00:00
Artur Wieczorek
1dec9f059b Credit for patch (r76895).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-12 19:34:50 +00:00
Artur Wieczorek
3adc631fa1 Use native renderer to draw check boxes in wxPG.
Use wxRendererNative procedure instead of custom check box drawing to get native look and feel of the check boxes in wxPG.

Closes #14881.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-12 16:34:27 +00:00
Artur Wieczorek
facbd123c2 Check if colour database exists before trying to use it in wxColourProperty.
Sanity check in wxColourProperty ctor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-12 16:07:54 +00:00
Artur Wieczorek
498dc8161c Allow use of all wxPG colours.
wxPG-specific colours are added to the colour database when wxColourProperty is created (already existing colours are not overwritten by wxPG ones).
Original list of wxPG colours was restored.

Closes #15597.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-12 10:47:15 +00:00
Tim Kosse
635694c9b3 wxBitmapComboBoxBase uses wxArrayPtrVoid, so we need to #include "wx/dynarray.h". This fixes a compile error in situations where wx/dynarray.h is not implicitly included through other headers, e.g. when building wx with many features disabled.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-12 08:31:22 +00:00
Artur Wieczorek
0228d578ee Allow clearing wxPG from within wxPG event handlers.
If wxPG::Clear is called from within event handler then it is not possible to delete all property items directly because some vital internal wxPG data are still in use. In this case it is necessary to put all items on the list for deferred deletion in wxPG idle state.

Closes #16222.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-11 17:25:39 +00:00
Artur Wieczorek
c16808c380 Adjust list of items for deferred deletion/removal if wxPG property item is actually deleted/removed.
When property is actually deleted/removed it must be also removed from the respective list of items for deferred deletion/removal in order to avoid crashes when it would be attempted to delete/remove it again at next wxPG idle state.
Because lists of items for deferred operations can be updated at every actual deletion/removal it is necessary to rearrange iteration through these lists in wxPG::OnIdle.

See #16222.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-11 17:01:28 +00:00
Artur Wieczorek
3048aa50af Prevent duplicating wxPG property items on the list of items for deferred deletion/removal.
It is necessary to prevent duplicating items on the list of items to be deleted/removed later on (in wxPropertyGrid::OnIdle) to avoid crashes when it would be attempted to delete/remove already deleted/removed item.

See #16222.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-11 16:38:18 +00:00
Vadim Zeitlin
47187f84bb Fix using wrong variable in wxMotif DoSetSizeIntr().
Use y instead of using x twice.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-11 13:38:06 +00:00
Artur Wieczorek
3a87deed2a Use XOR operation to toggle the state of check box in wxPG.
Minor optimization by using single XOR operation instead of separate AND, OR operations to toggle the state of wxSimpleCheckBox.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-10 16:35:36 +00:00
Artur Wieczorek
295549d95b Defer using of editable check box in wxPG until it is fully initialized.
Currently, when wxPGCheckBoxEditor is clicked then associated check box (wxSimpleCheckBox) is created and immediately after that its state is changed. This causes problems when underlaying validation is performed because the check box object is not yet registered as an active editor and thus it is not visible from within e.g. validation function.
We need to defer changing the initial state of the check box until this box is registered by queuing the special event which will be processed after initialization.

Closes #16361.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-10 16:22:06 +00:00
Tim Kosse
116112bcf5 Fix a compile error with some compilers introduced in r76813.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-10 09:51:41 +00:00
Artur Wieczorek
63a9cc4c2e Use automatically generated ID values for wxPG sub-controls.
Currently in wxPG there are used fixed "magic" ID values to identify sub-controls and this can lead to side effects if these values overlap with ID values assigned to another controls in the application (like e.g. menu items).

Closes #13634.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-09 18:56:36 +00:00
Artur Wieczorek
954ee459b4 Fix wxEnumProperty::GetIndexForValue
GetIndexForValue should indicate that given property value does not exist by returning special index value(-1).

Closes #14450.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-08 15:56:34 +00:00
Artur Wieczorek
71db47d26a Refresh property grid when property is switched to read-only state.
Property grid is refreshed to reflect the new state of the property.
Small refactoring of wxPropertyGridInterface class: SetPropertyReadOnly() function body moved from header file to source file.

Closes #16306.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-07 22:32:57 +00:00
Robin Dunn
e73166e01e revert last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-07 20:48:21 +00:00
Artur Wieczorek
1b54291068 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 2014-07-07 19:39:19 +00:00
Stefan Csomor
ef5ab70574 adding libs for ios
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-07 18:03:39 +00:00
Stefan Csomor
e8dc944da9 making choice of libcppunit explicit, no system installed version anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-07 14:21:14 +00:00
Tim Kosse
527d7d560c Tools can be specified without name in the XRC, so GetID() of the node returns wxID_ANY. Use the auto-assigned ID of the tool to refer to it instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-07 09:33:58 +00:00
Stefan Csomor
52920b4b9b reverting incorrect change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-07 05:16:33 +00:00
Stefan Csomor
37762124df adding padding nuls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-06 19:32:26 +00:00
Stefan Csomor
bf0a634c09 removing wxMacLaunch dependancy for ios
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-06 14:59:25 +00:00
Stefan Csomor
79eaaca192 fixing warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-06 14:58:41 +00:00
Stefan Csomor
121229b115 adding ios build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-06 14:58:10 +00:00
Stefan Csomor
2ade9eb811 added missing impl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-07-06 14:56:30 +00:00