Commit Graph

59867 Commits

Author SHA1 Message Date
Vadim Zeitlin
ffcc18580e Really fix use of wxTranslateFromUnicodeFormat() in the unit test.
Update the function declaration in the test too.

(Really) closes #16118.
2015-04-10 16:24:58 +02:00
Vadim Zeitlin
cbc3a5bbf2 Export wxTranslateFromUnicodeFormat() from DLL to allow testing it.
This should fix the build after adding the unit tests for this function in
adbc9863b2.

Closes #16118.
2015-04-10 16:15:56 +02:00
Dimitri Schoolwerth
adbc9863b2 Handle quotes in wxTranslateFromUnicodeFormat.
When parsing Unicode date formats text inside single quotes should not be
escaped and instead treated as literal text. In addition two single quotes
(either inside or outside quoted text) should be interpreted as a single
quote.

Fixes #16118.
2015-04-09 04:39:35 +04:00
Vadim Zeitlin
e44df8e12f Improve sizer flags validation in the XRC schema.
Validate flags for 1D horizontal and vertical sizers and grid sizers
separately to allow checking for invalid flag combinations.

Also try to make the regex patterns used in the schema itself and the error
messages generated when matching them fails slightly more readable.
2015-04-08 23:36:32 +02:00
Vadim Zeitlin
770bb3822c Update XRC version to the latest one in all XRC sample files.
The version doesn't really matter as the only change in 2.5.3.0 compared to
2.3.0.1 seems to be the handling of "\\" which doesn't occur in any of these
files anyhow, but use the latest one just in case anybody takes one of these
files as a starting point.
2015-04-08 23:35:20 +02:00
Vadim Zeitlin
45effb085a Fix XRC sample main frame initial and minimal size.
The size hints must be explicitly set if tool and/or status bars are added to
the frame after loading its contents from XRC. This didn't matter before
because the (only) item of the frame sizer effectively had wxGROW style and so
adjusted to the frame size even if it was less than the minimal size, but now
that wxALIGN_CENTER_VERTICAL, which was always specified in rc/frame.xrc file
but never taken into account before, is honoured, the initial frame size is
not big enough to show its contents which looks ugly, so work around this.
2015-04-08 23:35:20 +02:00
Vadim Zeitlin
a5988a0389 Fix invalid use of wxSizer flags inside the library itself.
It doesn't make sense to use wxALIGN_CENTRE_VERTICAL with wxGROW, so remove
the alignment style.
2015-04-08 23:35:19 +02:00
Vadim Zeitlin
16c22794b7 Give error messages for invalid sizer flags in XRC wxSizer handler.
This allows to give the exact line number of the error, unlike asserts that
happen in wxSizer code which don't point exactly to the error location when
sizers are created via XRC.

It also has the advantage of allowing to detect wrong use of wxALIGN_LEFT and
wxALIGN_TOP, unlike the asserts which can't do it because the value of both of
these flags is 0.
2015-04-08 23:35:19 +02:00
Vadim Zeitlin
58114f22c3 Detect the use of incompatible flags for wxGridSizer too.
Complain if wxEXPAND is combined with both horizontal and vertical alignment
flags, as this doesn't make sense and, moreover, the behaviour has changed
since the last commit: now wxEXPAND is ignored instead of overriding the
alignment flags if they are combined.
2015-04-08 23:35:19 +02:00
Vadim Zeitlin
9aaa38c7c8 Make it possible to combine wxEXPAND and alignment in wxGridSizer.
Allow overriding wxEXPAND effect in one of the directions by specifying
wxALIGN_{RIGHT,BOTTOM} or wxALIGN_CENTRE_{HORIZONTAL,VERTICAL} together with
it (unfortunately this doesn't work for wxALIGN_{LEFT,TOP} as their value is 0
and so their presence in flags can't be detected).
2015-04-08 23:35:19 +02:00
Vadim Zeitlin
233a7fe77b Add wxSizerFlags::Cent{er,re}{Vertical,Horizontal}().
Provide CentreVertical() and CentreHorizontal() methods in wxSizerFlags which
are useful for 2D sizers (for 1D ones just Centre() can be used anyhow).
2015-04-08 23:35:19 +02:00
Vadim Zeitlin
7e865daa26 Add unit test for wxFlexGridSizer layout logic.
Currently just test that wxEXPAND flag works as expected.
2015-04-08 23:35:19 +02:00
Vadim Zeitlin
78b98bf00c Validate wxBoxSizer flags instead of silently ignoring invalid combinations.
Detect using flags corresponding to the major sizer direction (which doesn't
make sense as only the proportion governs the behaviour in this direction) and
also combinations of alignment flags with wxEXPAND.
2015-04-08 23:35:19 +02:00
Vadim Zeitlin
7811394694 Add WX_ASSERT_FAILS_WITH_ASSERT_MESSAGE helper.
This is similar to the existing WX_ASSERT_FAILS_WITH_ASSERT, but allows to
specify the message to give if the expected assertion is not triggered.
2015-04-08 23:35:19 +02:00
Vadim Zeitlin
636d08323f Assert if incompatible sizer flags are used.
We can't check for all the invalid combinations, but at least check for
wxALIGN_CENTER_HORIZONTAL+wxALIGN_RIGHT and wxALIGN_CENTER_VERTICAL+
wxALIGN_BOTTOM which never make sense and can be detected.
2015-04-08 23:35:18 +02:00
Dimitri Schoolwerth
66cfa40643 Deal with remaining cvs/svn keywords.
A few $Id$ references remained after commit
3f66f6a5b3 or appeared in newly added files.
Remove the lines containing svn keywords except when it concerns
third-party files. In that case keep the line as-is or collapse it to the
keyword if it had been expanded to contain wx commit information (only
occurs with src/zlib/ChangeLog).
2015-04-09 03:32:23 +04:00
Vadim Zeitlin
5ff775234c Only use native wxAppProgressIndicator in wxOSX/Cocoa port.
It's not implemented for Carbon nor iOS.
2015-04-08 13:02:13 +02:00
Vadim Zeitlin
ad92074535 Update RegisterHotKey() documentation to mention OS X support.
This function is implemented in wxOSX too, not just wxMSW.

See #12354.
2015-04-08 11:56:51 +02:00
Vadim Zeitlin
288f03d86f Also disable wxUSE_ACTIVITYINDICATOR for wxiOS build.
Another attempt to fix the buildbot wxiOS build.
2015-04-07 22:40:56 +02:00
Vadim Zeitlin
ca42b4a686 Correct example of using custom classes in XRC schema comments.
Include the required namespaces declarations.

Also fix a syntax error in the example (s/,/&/) and show an example attribute
definition.
2015-04-07 14:42:15 +02:00
Vadim Zeitlin
72cba11aa2 Forcefully disable wxUSE_ADDREMOVECTRL in wxiOS build.
wxUSE_ADDREMOVECTRL requires wxUSE_BMPBUTTON which is currently not supported
in iOS, so disable it too.
2015-04-07 14:30:23 +02:00
Vadim Zeitlin
f86e22fc3b No real changes, just removed unused variables from samples.
Don't define constants which are never used to avoid clang
-Wunused-const-variable warnings.
2015-04-07 00:14:33 +02:00
Vadim Zeitlin
3ef04d4474 Use NULL, not false, for a pointer.
No real changes, just fix clang warning about returning "false" from a
function returning a pointer.
2015-04-07 00:14:32 +02:00
Artur Wieczorek
0bc20fee71 Non-PCH wxPG build fix after cc575a.
Include time.h to get wxMilliClock_t used now instead of wxLongLong for the timestamp.
2015-04-06 23:40:54 +02:00
Artur Wieczorek
830458af2b Non-PCH build fix after d892274.
Include time.h to get wxMilliClock_t used now instead of wxLongLong for the
timestamp.

Closes #16939.
2015-04-06 22:23:43 +02:00
Vadim Zeitlin
8577366bae Add check for wxUSE_ADDREMOVECTRL dependency on wxUSE_BMPBUTTON.
This should, in particular, fix the currently broken wxiOS build as
wxBitmapButton is not available in that port.
2015-04-06 22:15:26 +02:00
Vadim Zeitlin
89a791a938 Fix typo in wxUSE_LONGLONG check.
The recently added check had a typo in the constant name.

Closes #16939.
2015-04-05 20:06:09 +02:00
Artur Wieczorek
119e67d959 Only use wxDateTime in wxRichTextPrintout::SubstituteKeywords() if available.
Don't expand date and time fields if wxUSE_DATETIME==0.

See #16939.
2015-04-05 20:02:37 +02:00
Artur Wieczorek
a679d0440c Check for wxUSE_RICHTEXT dependencies in wx/chkconf.h.
wxRichTextCtrl requires wxHTML and wxLongLong, check for the options
consistency.

See #16939.
2015-04-05 20:02:19 +02:00
Artur Wieczorek
93b9126fe5 Check for wxUSE_STC dependency on wxUSE_STOPWATCH.
wxStyledTextCtrl requires wxStopWatch, so check that wxUSE_STOPWATCH is set if
wxUSE_MEDIACTRL is.

See #16939.
2015-04-05 19:59:36 +02:00
Artur Wieczorek
2e26d30bcc Check for wxUSE_MEDIACTRL dependency on wxUSE_LONLONG.
wxMediaCtrl requires wxLongLong, so check that wxUSE_LONLONG is set if
wxUSE_MEDIACTRL is.

See #16939.
2015-04-05 19:59:33 +02:00
Artur Wieczorek
0091246427 Only use wxDateTime in wxHtmlPrintout::TranslateHeader() if available.
Code using wxDateTime when preparing header should be active only if
wxUSE_DATETIME==1.

See #16939.
2015-04-05 19:57:20 +02:00
Artur Wieczorek
07d43d96aa Only use wxDateTime in wxMSW wxHandleFatalExceptions() if available.
Code using wxDateTime in wxHandleFatalExceptions() should be active only if
wxUSE_DATETIME==1.

See #16939.
2015-04-05 19:56:02 +02:00
Artur Wieczorek
01dde21e68 Handle wxLongLong wxConvertAnyToVariant only if wxUSE_LONGLONG==1.
Code responsible for handling wxLongLong datatype in wxConvertAnyToVariant()
should be active only if wxUSE_LONGLONG is enabled.

See #16939.
2015-04-04 17:52:46 +02:00
Artur Wieczorek
d8922744cf Use wxMilliClock_t to store values returned by wxGetLocalTimeMillis().
This fixes wxComboCtrl compilation with wxUSE_LONGLONG==0 as wxMilliClock_t is
always mapped to the proper base type and hence can be used even if wxLongLong
type is not defined.

See #16939.
2015-04-04 17:51:40 +02:00
Artur Wieczorek
a088915a56 Handle wxDateTime data in wxDataViewModel only if wxUSE_DATETIME==1.
Code using wxDateTime datatype in wxDataViewModel::Compare should be active
only if wxUSE_DATETIME is enabled.

See #16939.
2015-04-04 17:51:22 +02:00
Roberto Perpuly
69005ef145 Add to propgrid sample the option to select the way Boolean values are rendered.
This option is useful to demonstrate how to globally change the way Boolean values are rendered (either as check boxes or selection lists).

See #16922.
2015-04-04 10:19:31 +02:00
Artur Wieczorek
6d3fd35d0c Check if wxPGProperty is visible when it is attempted to refresh it.
Check if property page state (not its parent state) is the same as selected page state before refreshing.

Closes #16922.
2015-04-04 10:16:53 +02:00
Artur Wieczorek
1638644ea6 Relocate "Run test" menu items in the menu of propgrid sample.
Move "Run test" menu items from "Try These!" menu to "File" menu in propgrid sample. It seems to be more adequate location for such action items.
2015-04-04 00:42:31 +02:00
Artur Wieczorek
5158ce4944 Add wxPropertyGridInterface::SetPropertyValue setter for native datatypes wxLongLong_t and wxULongLong_t.
And fix typo in wxUSE_LONGLONG macro name.
2015-04-04 00:33:25 +02:00
Artur Wieczorek
726a5e1155 Prepare propgrid sample to build successfully when wxUSE_LONGLONG is disabled.
Make the code ready to build even when wxLongLong type is not available.
2015-04-03 21:14:06 +02:00
Artur Wieczorek
7c6943175b Prepare wxPG to build successfully when wxUSE_LONGLONG or wxUSE_DATETIME is disabled.
Make the code ready to build even when wxLongLong and wxDateTime types are not available.
2015-04-03 21:12:54 +02:00
Artur Wieczorek
cc575a7a89 Use in wxPG classes wxMilliClock_t variables to store values returned by wxGetLocalTimeMillis() function.
wxMilliClock_t is always mapped to the proper base type and hence can be used even if wxLongLong type is not defined (when wxUSE_LONGLONG is disabled).
2015-04-03 21:11:15 +02:00
Artur Wieczorek
6a7b95f419 Use predefined constants to represent common wxPG variant types (cont.).
Instead of using individual string literals use globally defined constants representing wxPG variant types (wxLongLong, wxULongLong, wxArrayInt, etc.).
2015-04-03 21:09:12 +02:00
Vadim Zeitlin
d89d730900 Fix bug with clearing shared alpha channel in wxImage::ClearAlpha().
Allocate our own exclusive copy of the data before modifying it, otherwise
calling ClearAlpha() would clear alpha not only for the image it was called on
but also for all the other images sharing data with it.
2015-04-01 14:36:35 +02:00
Vadim Zeitlin
ffd2857571 Fix vertical alpha adjustment in wxPixelData<wxImage>::Offset().
Handle "y" parameter correctly when offsetting m_pAlpha, it was just ignored
before, i.e. Offset(x, y) and OffsetY(y) always behaved as if y were 1.
2015-04-01 14:15:11 +02:00
kkrev
2349bce2c4 Add wxTreeListCtrl::EnsureVisible().
Just forward this to the wxDataViewCtrl method with the same name.

Closes #16937.
2015-03-31 21:57:16 +02:00
Artur Wieczorek
3e62d33935 Update composite wxStringProperty labels and values in propgrid sample.
Set some strings and labels to the more current values.
2015-03-31 19:14:36 +02:00
Artur Wieczorek
d00c184ec8 Simplify declaration and definition of some wxPropertyGridInterface::GetPropertyValueAsXXX methods.
For IMPLEMENT_GET_VALUE macro which is used to implement specialized methods (for bool and double types) define additional parameter to provide explicitly corresponding wxPG type name. With this additional parameter it is not necessary to maintain a separate list of constants containing wxPG type names only for the purposes of this macro and globally defined literals can be used instead.
2015-03-30 23:57:51 +02:00
Artur Wieczorek
4e7fbd4e92 Use predefined constants to represent wxPG variant types.
Instead of using individual string literals use globally defined constants representing wxPG variant types.
2015-03-29 21:42:58 +02:00