Commit Graph

50746 Commits

Author SHA1 Message Date
Robin Dunn
0a492dbe7a #include <algorithm>
to fix problem in PCH-less STL builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 22:23:45 +00:00
Stefan Csomor
6aa3f3de0c fixing NSFontDescriptor matching for font weights and styles, fixes #11910
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 22:07:02 +00:00
Robin Dunn
068c8da4a8 (blind) fix for buildbot breakage with MSVC 6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 21:56:08 +00:00
Robin Dunn
b5fe65c819 Drop the Array class added in the last scintilla patch and switch to using wxVector instead. Closes #11765.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 20:40:32 +00:00
Robin Dunn
38723be1d5 Add wxVectorSort function for sorting wxVector<T> containers. Closes #11889
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 20:32:25 +00:00
Robin Dunn
455bec652a Test m_dc before using it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 20:29:08 +00:00
Stefan Csomor
81533a3af6 fixing focus, fixes #11911
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 20:27:17 +00:00
Václav Slavík
c707d82e82 Fixed wxFileSystem::FileNameToURL() regression with UNC paths.
We cannot use wxURI to do the escaping, because wxFileSystem depends on
use of nonstandard escaping and prefixes (wxURI eats away
file:// prefix, while wxFileSystem uses it to signify UNC paths;
wxFileSystem needs to escape #,: as well).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 18:59:51 +00:00
Stefan Csomor
c4a7e284fd borders might have to be drawn differently
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 18:42:08 +00:00
Vadim Zeitlin
c26400bd06 Fix harmless MSVC warning about int to bool conversion in Scintilla.
The warning is harmless but prevents buildbot from reporting any new warnings
during the library compilation step so suppress it.

Notice that it might be better if ViewStyle::extraFontFlag was bool and not
int to begin with.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 12:55:21 +00:00
Vadim Zeitlin
ceed155e8a Suppress dummy gcc warnings in regex library code.
These warnings are harmless (variables are always initialized when they are
used) but they unfortunately prevent buildbot from reporting any new warnings
(which may not be harmless) during the library compilation step so suppress
them in the least intrusive way possible.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 12:52:31 +00:00
Vadim Zeitlin
7f19ef40eb Work around "possibly uninitialized variable" warning in wxFileName.
Initialize multiplier to its default value in GetHumanReadableSize() to avoid
a "warning: 'multiplier' may be used uninitialized in this function" from g++.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 12:43:29 +00:00
Vadim Zeitlin
a07526187a Rename the rest of wxSIZE_CONV_TRADIONAL to wxSIZE_CONV_TRADITIONAL.
Fix tests compilation after r63886.

See #10673.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 10:50:41 +00:00
Vadim Zeitlin
72822505f7 Correct documentation of wxSizeConvention elements.
1KiB is 1024 bytes, not 1000. Also put the elements in the correct order (same
as in the real header).

See #10673.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 10:50:37 +00:00
Stefan Csomor
2be05d4525 switching loop mode for idle processing, fixes #11912 (left is a redraw issue, textfield borders are not repainted correctly when enabling)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 09:05:26 +00:00
Stefan Csomor
f68376d932 moving static box construction - z Order makes checkboxes nonresponsive otherwise on OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 07:22:30 +00:00
Vadim Zeitlin
e793ec1449 Fix wxGTK compilation after r63880.
SendTextUpdatedEvent() needs to be public as it's called from GTK callback.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 23:51:13 +00:00
Francesco Montorsi
2febffbac7 fix typos introduced by error in r63870 (see #10673)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 22:51:11 +00:00
Stefan Csomor
e32454eadc making gradients working again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 22:43:49 +00:00
Stefan Csomor
1a289c624b supporting text foreground color, fixes #11903
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 21:17:59 +00:00
Stefan Csomor
24e6777949 fixing warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:57:35 +00:00
Vadim Zeitlin
356fd0b532 Add wxTextEntryBase::ForwardEnableTextChangedEvents().
Use this method to forward the status of text events in the implementation of
wxComboBox in wxOSX/Carbon. This ensures that the events are correctly [not]
generated when various wxComboBox methods are called.

The unit tests now also pass with wxOSX/Carbon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:46:35 +00:00
Vadim Zeitlin
e567904ae6 Fix text text changed events sending in OS X combo box and text control.
Don't duplicate needlessly wxTextEntry functionality in wxTextCtrl.

Don't clear the combobox text entry part twice in wxComboBox::DoClear(), it is
supposed to only clear the item container contents as the base class Clear()
already calls wxTextEntry::Clear().

Do send text updated events from wxTextEntry itself as it applies to
wxComboBox just as well as to wxTextCtrl.

The unit tests now pass under wxOSX/Cocoa, not breaking them again would be
appreciated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:46:29 +00:00
Vadim Zeitlin
501358073b Move SendTextUpdatedEvent() down to wxTextEntryBase from wxTextCtrlBase.
This will allow reusing it in wxComboBox implementation as well.

Also add SendTextUpdatedEventIfAllowed() which can be used to only send the
events if they were not blocked at wxTextEntry level.

No real changes otherwise.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:46:24 +00:00
Vadim Zeitlin
ca1f7cb563 Implement support for gradient stops for OS X.
Currently the code still doesn't work but OTOH it's not any worse than what it
was before.

See #11904.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:46:18 +00:00
Vadim Zeitlin
005ac806ea Remove duplicated GetTextPeer() definitions from derived classes.
GetTextPeer() may be implemented directly in wxTextEntry under OS X, there is
no need to define it (identically) in wxTextCtrl and wxComboBox.

Also just call this method instead of duplicating its code in wxOSX
wxTextCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:46:14 +00:00
Vadim Zeitlin
f25cb0af6b Set the value passed to wxComboBox ctor in wxOSX/Cocoa.
The initial value was simply ignored, do use it now if it's specified, i.e.
non empty.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:46:09 +00:00
Vadim Zeitlin
96dfe7577a Suppress a harmless signed/unsigned comparison warning.
wxComboBox::FindString() used int loop index, change it to unsigned one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:46:05 +00:00
Vadim Zeitlin
de5361faf3 Suppress unused parameter warnings.
observer argument of wxCFEventLoop::ObserverCallBack() and timestampsec one of
wxComboBox::OSXHandleClicked() were unused and generated gcc warnings.

wxComboBox::EnableTextChangedEvents() needs to be implemented but as there is
already a wxFAIL in it an extra warning is not really useful.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 18:46:00 +00:00
Vadim Zeitlin
58271f42ce Attempt to correct mysterious MSVC6 compilation error.
For some reasons MSVC6 refuses to compile TestData struct initialization. Try
to work around it by not using wxULongLong as this looks like the only thing
which might be confusing it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 17:38:27 +00:00
Vadim Zeitlin
be8332eb97 Fix more harmless warnings.
Fix a warning about unused parameters and another about signed/unsigned
comparison during samples and tests compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 17:38:23 +00:00
Stefan Csomor
ac349b6e66 adding clipboard events, fixes #11906
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 16:51:12 +00:00
Vadim Zeitlin
b11b437e8d Remove extra semicolons from NOTIFYICONDATA_V[12]_SIZE definitions.
These semicolons prevented the code from compiling when using old SDK which
didn't provide these symbols itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 16:23:15 +00:00
Vadim Zeitlin
b2edb8f3c5 Add support for IEC and SI size units to wxFileName::GetHumanReadableSize().
Allow choosing the multiplier to use (1000 or 1024) and the names of the units
(SI or IEC). By default, still use traditional convention, i.e. multiplier of
1024 but SI unit names. This will probably need to be changed to use IEC units
in the future.

Also added unit test for this function.

Closes #10673.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 14:53:04 +00:00
Vadim Zeitlin
2028c33ab5 Add default constructor to wxGraphicsGradientStop.
It may be convenient to create wxGraphicsGradientStop first and initialize it
later so allow doing this by providing the default argument for constructor
parameters and thus allowing to use it as the default constructor.

See #11897.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 13:55:35 +00:00
Vadim Zeitlin
cc16513e28 Correct check for MSVC version in wxUSE_GRAPHICS_CONTEXT definition.
Set wxUSE_GRAPHICS_CONTEXT to 1 by default for MSVC 7.1+ and not 8+.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 13:55:30 +00:00
Jouk Jansen
b8cfc639ce Update OpenVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 09:47:19 +00:00
Vadim Zeitlin
3784bf308f Correct checks for gradient stop position.
It may be <= 1 in the final version and not < 1.

See #11897.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-06 00:17:16 +00:00
Robert Roebling
86ad5903b9 non PCH compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:52:05 +00:00
Václav Slavík
c765e6fb9d Fix text input and completion in wxComboCtrl and wxOwnerDrawnComboBox.
Both wxEVT_KEY_DOWN and wxEVT_CHAR must be handled and only the latter
used for completion (or any characters input). Don't make incorrect
assumptions about wxEVT_CHAR keycodes either, it's only the Unicode
character and printability that matter.

Otherwise, completion in readonly controls wouldn't work correctly
for e.g. numbers on numpad or non-ASCII characters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:19:04 +00:00
Václav Slavík
10265e6c41 wxOwnerDrawnComboBox: handle Home and End keys as native control does.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:18:58 +00:00
Václav Slavík
174b5c87bc Pass events around with ProcessEvent(), not AddPendingEvent().
The latter adds the event for later processing. As a result, the event
appears to be processed to the caller, even if the handled it was passed
to called Skip() on it. ProcessEvent() doesn't suffer from this problem,
it may modify the event as expected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:18:55 +00:00
Václav Slavík
293987e80c wxOwnerDrawnComboBox: handle numpad navigation keys.
For consitency with the native control, up/down/pgup/pgdown keys should
be handled even when pressed on the numpad.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:18:50 +00:00
Václav Slavík
f408451314 Implement native mousewheel behaviour in wxOwnerDrawnComboBox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:18:46 +00:00
Václav Slavík
ffe42ca627 In wxPopupFocusHandler, watch for EVT_CHAR, not EVT_KEY_DOWN.
We should close the popup only if neither of these events was processed;
previously, EVT_CHAR would never reach the popup in open state, as it
would be closed automatically.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:18:41 +00:00
Stefan Csomor
88695e9ab8 moving OnInit back
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 12:44:31 +00:00
Vadim Zeitlin
4ee4c7b948 Add support for gradient stops to wxGraphicsContext.
Allow specifying a set of gradient stops instead of just the beginning and
ending colours. Add the new wxGraphicsGradientStop(s) classes and new
wxGraphicsContext::Create{Linear,Radial}GradientBrush() overloads. Also change
the same methods of wxGraphicsRenderer to take wxGraphicsGradientStops instead
of a pair of colours.

Implement the new API for MSW and Cairo. OS X still uses just the two colours
for now.

Closes #11897.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 12:15:11 +00:00
Vadim Zeitlin
cd300ef760 Add wxTransparentColour global pseudo-variable.
Introduce a symbolic name for a fully transparent colour.

See #11897.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 11:44:33 +00:00
Vadim Zeitlin
f49c80c105 Use helper wxColourToColor function in wxMSW wxGraphicsContext code.
Don't repeat Color ctor from wxColour all the time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 11:44:28 +00:00
Paul Cornett
cffda6922a avoid setting negative window size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 01:07:24 +00:00