Václav Slavík [Sun, 6 Mar 2011 18:22:23 +0000 (18:22 +0000)]
Include gdk/gdkkeysyms-compat.h.
GTK+ 2.22 changed GDK_* keysym constants to GDK_KEY_* and introduced a new header for the old names. This header must be explicitly included in GTK+ 3, so do it for now. In the long run, we should migrate to the new names.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67136
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sun, 6 Mar 2011 15:27:44 +0000 (15:27 +0000)]
use FixedToFloat everywhere to make sure we don't round too early, preserve fractional width with CoreText as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67135
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sun, 6 Mar 2011 15:24:26 +0000 (15:24 +0000)]
position buttons to the right on OSX as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67134
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sun, 6 Mar 2011 14:49:19 +0000 (14:49 +0000)]
fix positioning bug with window disabler and hidden windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67133
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Sun, 6 Mar 2011 09:09:42 +0000 (09:09 +0000)]
Fixed #13017: wxRichTextCtrl CopyToClipboard regression
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67132
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 5 Mar 2011 12:21:20 +0000 (12:21 +0000)]
support wxWindowDisabler on osx_cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67129
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 5 Mar 2011 11:16:55 +0000 (11:16 +0000)]
Add a dependency of wxUSE_TASKBARICON on wxUSE_MENUS.
PopupMenu() method of wxTaskBarIcon doesn't make much sense without wxMenu.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67128
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 5 Mar 2011 11:16:51 +0000 (11:16 +0000)]
Don't initialize wxGBSpan with invalid values in wxGBSizerItem.
Default wxGBSizerItem ctor initialized wxGBSpan with invalid values which
resulted in an assert when loading wxGBSizer from XRC since r66964.
Fix this by simply using the default wxGBSpan ctor instead.
Closes #13004.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67127
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Paul Cornett [Thu, 3 Mar 2011 17:51:52 +0000 (17:51 +0000)]
fix Activate signature after r67099
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67120
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Wed, 2 Mar 2011 21:17:43 +0000 (21:17 +0000)]
proper focus lost for multiline textfields and having all demanding a focusrect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67114
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Wed, 2 Mar 2011 21:16:30 +0000 (21:16 +0000)]
the wx part knows better whether it has the focus (may be the embedded NSView, not the m_peer)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67113
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Wed, 2 Mar 2011 20:55:39 +0000 (20:55 +0000)]
Fixed a problem with paste resetting the content paragraph style.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67112
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Wed, 2 Mar 2011 16:23:57 +0000 (16:23 +0000)]
move accel handling in front of the normal keyDown handling, support non-command menu accels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67110
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Wed, 2 Mar 2011 16:21:24 +0000 (16:21 +0000)]
move accel handling in front of the normal keyDown handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67109
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Wed, 2 Mar 2011 15:43:42 +0000 (15:43 +0000)]
supporting more key equivalents for display, fixing setHidden: method warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67108
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Wed, 2 Mar 2011 15:42:45 +0000 (15:42 +0000)]
removing code that will not have to be updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67107
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 2 Mar 2011 10:28:25 +0000 (10:28 +0000)]
Japanese translations update from Suzumizaki-Kimitaka.
Closes #11773.
Closes #13003.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67105
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 2 Mar 2011 10:28:20 +0000 (10:28 +0000)]
Fix typo in wxStack<T> documentation.
I somehow managed to misspell wxStack<T> as wxSort<>.
Closes #13002.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67104
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 2 Mar 2011 10:15:35 +0000 (10:15 +0000)]
Add missing wxUSE_MARKUP checks in wxOSX code.
Don't define wxWidgetImpl::SetLabelMarkup() when wxUSE_MARKUP is off and
definitely don't reimplement it in wxButtonCocoaImpl as this code doesn't
compile without markup support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67103
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Dimitri Schoolwerth [Tue, 1 Mar 2011 21:29:17 +0000 (21:29 +0000)]
Improved palette handling with saving PNG files.
Instead of converting alpha to a mask an attempt is made to write a palettised PNG file with an ARGB palette using a maximum of 256 transparency values where formerly just up to one was supported. GIF images with 256 colours and transparency can now also be saved as a palettised PNG instead of true colour, making the image a lot smaller.
Applied (modified) patch by troelsk. Closes #12850.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67101
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Václav Slavík [Tue, 1 Mar 2011 12:16:49 +0000 (12:16 +0000)]
Pass wxRect/wxPoint arguments to wxDataViewCustomRenderer by reference.
Instead of passing them by value, use const reference. This change
is safe to do, because these methods' signatures were different in 2.8
anyhow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67099
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Václav Slavík [Tue, 1 Mar 2011 12:16:45 +0000 (12:16 +0000)]
Fixed typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67098
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Václav Slavík [Mon, 28 Feb 2011 21:23:10 +0000 (21:23 +0000)]
Toggle checkboxes in generic wxDataViewCtrl with single click.
Both GTK+ and OS X native controls use single click to toggle
checkboxes, instead of double-click activation used by the generic
version. So does wxCheckListBox on Windows, so make wxDVC
behave the same way.
See #11185.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67094
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Václav Slavík [Mon, 28 Feb 2011 21:23:04 +0000 (21:23 +0000)]
Get rid of WXGetAsCustom().
Instead, have WXOnActivate() and WXOnLeftClick() with same signatures as
their public API counterparts and just call Activate/LeftClick() from
them for wxDataViewCustomRenderer.
This accomplishes the same thing, but makes it easier to override
behaviour in wx's internal implementations of renderers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67093
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Václav Slavík [Mon, 28 Feb 2011 21:23:00 +0000 (21:23 +0000)]
wxDataViewCtrl: Fully prepare renderer for Activate() call.
Instead of just setting the value in the generic implementation, do full
preparation (incl. attributes etc.) as everywhere else.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67092
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 19:46:29 +0000 (19:46 +0000)]
adding hour constant to carbon build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67091
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 19:29:15 +0000 (19:29 +0000)]
fixing non-precomp headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67090
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 14:47:32 +0000 (14:47 +0000)]
disable cursorRects for global busy state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67088
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 14:39:37 +0000 (14:39 +0000)]
avoid setting live cursor during busy state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67087
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 13:44:25 +0000 (13:44 +0000)]
add watch cursor to osx_cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67086
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 12:14:15 +0000 (12:14 +0000)]
don't swallow command events that are not handled by accels, fixes #12373
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67085
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 10:12:06 +0000 (10:12 +0000)]
adding taskbar implementation for statusitem (menubar) and dock, fixes #12838
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67084
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 10:10:08 +0000 (10:10 +0000)]
moving appdelegate declaration to header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67083
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 10:07:00 +0000 (10:07 +0000)]
make sure the quit item is only shown where appropriate on osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67082
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Mon, 28 Feb 2011 09:26:55 +0000 (09:26 +0000)]
osx_cocoa supports both kind of taskbaricons in the menubar (standard) and as function of the dock (type DOCK)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67081
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sun, 27 Feb 2011 20:38:40 +0000 (20:38 +0000)]
make sure 10.4 command-key events are routed via the wx-accelerator route as well, fixes #12373
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67078
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 18:36:55 +0000 (18:36 +0000)]
Use single quotes in wxMarkupText unit test to work around VC6 bug.
VC6 seems to have a strange bug with escaped quotes used in strings passed to
macros and failed to compile the original code with nonsensical error messages.
Use single quotes to try to work around this issue. They are also somewhat
more readable as they don't need to be escaped inside C strings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67077
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 18:36:52 +0000 (18:36 +0000)]
Add a trivial virtual dtor to wxMarkupParserOutput.
This class isn't really supposed to be used polymorphically but add a virtual
dtor just to suppress g++ warning about it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67076
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 18:36:48 +0000 (18:36 +0000)]
Another fix for PCH-less build in markup code.
Include wx/control.h to use wxControl::RemoveMnemonics() and
FindAccelInIndex().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67075
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Dimitri Schoolwerth [Sun, 27 Feb 2011 15:09:13 +0000 (15:09 +0000)]
Fixed drawing glitch with vertical MSW toolbars.
In case of a certain amount of whitespace at the bottom of a vertical toolbar it would not be drawn correctly: the more whitespace the more painting would be clipped starting from the left (covering the whole height of the toolbar) until the toolbar would look completely empty.
This was reproducible using the toolbar sample, setting the toolbar on the left or right edge of the window and then increasing the height of the window sufficiently.
Regression since r62971.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67074
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 14:01:36 +0000 (14:01 +0000)]
Replace template function with template class to placate VC6.
VC6 has very poor support for template functions and in particular doesn't
understand explicitly choosing the type of the function to call so replace
template DoApplyToFont() function with FontModifier template class in
wxMarkupParserAttrOutput implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67073
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 13:17:41 +0000 (13:17 +0000)]
Fix for PCH-less build in markup code.
Include wx/log.h to use wxLogDebug().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67072
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:54 +0000 (12:48 +0000)]
Update markup support documentation.
Mention that wxButton and wxStaticText now support markup in all major ports
(using the generic version of the latter under MSW).
Also mention markup changes in the change log.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67070
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:46 +0000 (12:48 +0000)]
Add markup support to wxOSX/Cocoa wxStaticText and wxButton.
Add wxMarkupToAttrString helper that converts wx markup to OS X attribute
strings and use it in wxStaticText and wxButton.
This required adding new SetLabelMarkup() method to wxWidgetCocoaImpl, it
seems to make sense to have it there as it could be implemented by more
controls in the future.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67069
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:42 +0000 (12:48 +0000)]
No real changes, just make wxColour::OSXGetNSColor() const.
There is no reason to not allow calling this method on const wxColour objects.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67068
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:38 +0000 (12:48 +0000)]
Add markup support to generic wxStaticText implementation.
wxMarkupText allows to easily support markup in the controls that we draw
ourselves so use it in wxGenericStaticText to have a possibility to use
markup on all platforms, even those where there is no native markup support in
wxStaticText itself.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67067
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:30 +0000 (12:48 +0000)]
Implement support for markup labels for wxGTK wxButton.
Simply directly set the markup for the GtkLabel used by GtkButton internally.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67066
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:26 +0000 (12:48 +0000)]
Add markup support to wxMSW wxButton and show it in the sample.
Use recently added wxMarkupText to implement support for markup in wxMSW
wxButton.
Update the button page of the widgets sample to show markup support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67065
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:21 +0000 (12:48 +0000)]
Add generic wxMarkupText class implementing handling of markup.
wxMarkupText is a private class that implements generic handling of markup
strings, i.e. can measure them and render them onto a wxDC.
This class will be used for markup support in wxMSW wxButton.
Also add wxMarkupParserAttrOutput which will be useful for other wxMarkupText
implementations.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67064
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:13 +0000 (12:48 +0000)]
Add wxDC::GetFontMetrics() and implement it for wxMSW.
Add a new wxDC method allowing to retrieve the font characteristics not
available from GetTextExtent(), notably the internal leading (and also the
average font width).
Currently this is implemented for wxMSW only, the internal leading is always 0
in the other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67063
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:48:07 +0000 (12:48 +0000)]
Add wxUSE_MARKUP and wrap SetLabelMarkup() in it.
Make it possible to disable all the new markup-related code by setting
wxUSE_MARKUP to 0 in setup.h or using configure --disable-markup option.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67062
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:59 +0000 (12:47 +0000)]
No changes, just add a couple of #if wxUSE_COMMANDLINKBUTTON tests.
Don't even declare m_chkCommandLink if we have no support for command link
buttons in the library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67061
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:55 +0000 (12:47 +0000)]
Draw the underline 1 pixel higher in wxDC::DrawLabel().
Adjust the height of the underline to be compatible with native MSW behaviour.
Notice that in wxGTK we should use pango_font_metrics_get_underline_position()
to get the font-dependent value that should be used here.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67060
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:48 +0000 (12:47 +0000)]
Restore height tweaking in wxMSWButton::GetFittingSize().
The change of r66893 was wrong, we do need to adjust the button height here
because the increase to standard height is not enough if we use bigger fonts
that require making taller buttons.
The real problem was the use of EDIT_HEIGHT_FROM_CHAR_HEIGHT() which added too
much to the height, so replace it with something based on the actual font
height. This is still arbitrary but slightly better.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67059
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:43 +0000 (12:47 +0000)]
Initialize wxButton::m_authNeeded in ctor and not Create() in wxMSW.
Ensure that the member is always initialized as calling GetAuthNeeded() for a
default-constructed button would access a non-initialized variable before.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67058
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:36 +0000 (12:47 +0000)]
No changes, just do wxButton fields initialization in Init() in wxMSW.
Add a helper function called from ctors and initialize m_imageData in it
instead of doing it in each ctor -- this will be more important when we add
more wxButton members.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67057
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:31 +0000 (12:47 +0000)]
No changes, just move wxMSW wxButton::MakeOwnerDrawn() around.
Put this method in the existing private section at the end of the class
instead of having an extra access specifier just for it for some reason.
Also add a comment explaining what it does and when is it used.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67056
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:26 +0000 (12:47 +0000)]
Replace wxST_MARKUP style with wxControl::SetLabelMarkup().
This is an incompatible change which removes the wxStaticText-specific
wxST_MARKUP style and adds wxControl::SetLabelMarkup() replacing it.
It doesn't actually change anything yet but it simplifies wxStaticText code a
lot by getting rid of many markup-related functions in it which had to behave
differently depending on whether wxST_MARKUP was used or not and also paves
way for adding markup support for the other controls in the future.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67055
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:15 +0000 (12:47 +0000)]
Don't call base class SetLabel() from GTKSetLabelForLabel().
Calling wxControlBase::SetLabel() only from GTKSetLabelForLabel() made its
behaviour inconsistent with GTKSetLabelWithMarkupForLabel() and also was
redundant in all but two places from which it was called, so remove this call
from this function itself and instead add it to its callers where it's really
needed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67054
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:11 +0000 (12:47 +0000)]
Remove unnecessary use of RemoveMarkup() in wxMSW wxHyperlinkCtrl.
Only the ampersands need to be escaped when setting the text of a native hyper
link control in MSW and this is done by wxControl::EscapeMnemonics(), not by
wxStaticText::RemoveMarkup() which also removes any tags which is not wanted
at all here.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67053
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:47:05 +0000 (12:47 +0000)]
Add wxFont::SetSymbolicSize() and SetSymbolicSizeRelativeTo().
These methods allow to set the font size using CSS-like absolute size
specifications.
Notice that the factors used here are incompatible with (but better than) the
ones used in wxBuildFontSizes() in src/html/winpars.cpp. In the future it
would be nice to reuse the new wxFont functions in wxHTML code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67052
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:46:59 +0000 (12:46 +0000)]
Add wxFont::Underlined() and MakeUnderlined() methods.
Add two more helpers for consistency with the existing methods such as Bold()
and MakeBold().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67051
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:46:55 +0000 (12:46 +0000)]
Use wxMarkupParser in wxStaticText for dealing with markup.
No real changes, just remove markup parsing code from wxStaticText
implementation and reuse wxMarkupParser methods there instead.
This makes include/wx/private/stattext.h file unnecessary as it is used only
in a single place now so remove it and move its remaining contents to
src/gtk/mnemonics.cpp.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67050
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:46:48 +0000 (12:46 +0000)]
Add wxMarkupParser::Strip().
This helper function strips all markup tags from the string (and also decodes
the XML entities in it).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67049
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:46:42 +0000 (12:46 +0000)]
Add a class for parsing simple markup.
This code is not used anywhere yet, this commit only adds the parser for the
markup and the related classes as well as the corresponding unit test.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67048
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:46:34 +0000 (12:46 +0000)]
Add a simple wxStack<> template class based on wxVector<>.
This is still simpler than std::stack<> which can be used with any container
and not just wxVector<> but better than the WX_DECLARE_STACK() macro which was
all that we had before.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67047
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:45:30 +0000 (12:45 +0000)]
Disable NumValidatorTestCase::Interactive() for build bot slaves.
This test consistently fails on the MSW build slave machines (see e.g.
http://buildbot.tt-solutions.com/wx/builders/XPSP2 VC9 wxMSW trunk release/builds/2084/steps/test/logs/stdio)
for unknown reason so disable it for them. Notice that it does pass when ran
locally so it looks like another instance of a problem with wxUIActionSimulator
on these machines rather than the problem with the class itself.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67046
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:45:24 +0000 (12:45 +0000)]
Only use wxBU_EXACTFIT for width calculations in wxMSW wxButton.
wxBU_EXACTFIT should affect the width of the button best size but not its
height which should be at least the same as the height of a standard button
even when wxBU_EXACTFIT is specified, otherwise buttons created with it (like
the one in generic wxCollapsiblePane implementation) look completely ugly.
This commit restores the old behaviour which was recently changed by wxButton
sizing code simplifications.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67045
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sun, 27 Feb 2011 12:45:19 +0000 (12:45 +0000)]
Specify correct size for disabled image list in wxMSW wxToolBar.
Use the real bitmap size instead of the default tool size when creating the
disabled image list as the actual bitmap size could be less than the default
one and in this case adding images to the image list later would fail (as
could be seen by using custom bitmaps in the toolbar sample).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67044
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Sun, 27 Feb 2011 08:51:01 +0000 (08:51 +0000)]
Include image.h and check for wxUSE_IMAGE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67043
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Sun, 27 Feb 2011 08:13:56 +0000 (08:13 +0000)]
Applied #12985: Improved installation instructions for wxWidgets for Mac OS X Cocoa and Carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67040
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 26 Feb 2011 17:51:34 +0000 (17:51 +0000)]
Fix libraries order in screenshotgen bakefile.
The richtext library must come before the adv one as it depends on the classes
in the latter and with the old libraries order linking failed in static build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67033
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 26 Feb 2011 17:46:57 +0000 (17:46 +0000)]
Mention wxZlib classes in archives overview.
Closes #12974.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67032
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 26 Feb 2011 17:46:54 +0000 (17:46 +0000)]
Don't use wxTE_PROCESS_ENTER in wxSpinCtrlGeneric.
We don't need to catch Enter presses to generate spin control events as we do
it anyhow when we lose focus. So simply remove the Enter handling code
entirely (it could be used to generate wxEVT_COMMAND_TEXT_ENTER events but we
don't generate them nor wxEVT_COMMAND_TEXT_UPDATED at all currently in the
generic version).
Closes #12980.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67031
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Sat, 26 Feb 2011 17:46:51 +0000 (17:46 +0000)]
Don't use wxTE_NOHIDESEL in wxSpinCtrlGeneric.
There is no reason to use this flag for the spin control and doing it makes it
gratuitously different from the native one under wxMSW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67030
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 26 Feb 2011 15:44:14 +0000 (15:44 +0000)]
fixing support for true children of wxStaticBox with wxStaticBoxSizer under osx_cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67029
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 26 Feb 2011 11:04:43 +0000 (11:04 +0000)]
making GetPosition 1:1 symmetrical to Move (respecting contentViews), fixing borderDrawing within NSBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67028
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Fri, 25 Feb 2011 17:28:27 +0000 (17:28 +0000)]
Fix for #11647: text from WriteText not scrolled to be visible in wxRichTextCtrl
IsPositionVisible was incorrect.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67026
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Jaakko Salli [Fri, 25 Feb 2011 13:00:57 +0000 (13:00 +0000)]
In wxPGProperty::SetValueImage(), use wxImage::Rescale() for scaling down the bitmap instead of wx(Memory)DC functions. Results should look much nicer and also retains alpha channel with much less effert.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67024
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Fri, 25 Feb 2011 12:25:12 +0000 (12:25 +0000)]
Applied patch in #12279: in wxRichTextCtrl, when wxRE_READONLY is set, the undo, redo function should be disabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67022
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Fri, 25 Feb 2011 12:21:56 +0000 (12:21 +0000)]
Applied #12601: Background color when saving wxRichText to HTML file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67021
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Fri, 25 Feb 2011 11:37:20 +0000 (11:37 +0000)]
Applied #12941: Fixes and enhancements for wxRTC (Robert Hoffman)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67020
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Fri, 25 Feb 2011 09:38:35 +0000 (09:38 +0000)]
Added wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT to fix tree and list control selection rendering.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67018
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Thu, 24 Feb 2011 20:34:48 +0000 (20:34 +0000)]
Handle ANSI release configuration correctly in msvc/wx/setup.h.
Preprocessor operations don't work with empty values so check for the case of
empty suffix specially.
This avoid warnings about "not enough actual parameters for macro
'wxSTRINGIZE_HELPER'" from MSVC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67015
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Thu, 24 Feb 2011 20:34:45 +0000 (20:34 +0000)]
No changes, just fix a typo in the changelog.
s/futher/further/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67014
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Thu, 24 Feb 2011 14:56:40 +0000 (14:56 +0000)]
reverting part of r58797, otherwise wxClientDC get no graphics context at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67012
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Wed, 23 Feb 2011 23:35:48 +0000 (23:35 +0000)]
Update and improve "Hello world" example in the documentation.
The example was corrupted by transition to Doxygen (the menu item labels got
eaten), fix it to actually work.
Also use this opportunity to improve and modernize it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67006
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 22 Feb 2011 18:51:10 +0000 (18:51 +0000)]
supporting content size scaling (retina display)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67001
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Tue, 22 Feb 2011 15:47:09 +0000 (15:47 +0000)]
building iphone again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66998
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 22 Feb 2011 13:55:56 +0000 (13:55 +0000)]
Update Czech translations.
Apply update from Zbynek Schwarz.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66997
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 22 Feb 2011 13:26:06 +0000 (13:26 +0000)]
Don't duplicate INVALID_FILE_ATTRIBUTES definition.
Move it in wx/msw/missing.h header instead of defining it in two different
places.
Closes #12964.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66996
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 22 Feb 2011 13:26:00 +0000 (13:26 +0000)]
Test for cairo_push_group() in configure.
This function is required by wxGraphicsContext Cairo-based implementation but
is missing in old Cairo versions so check for it in configure and disable
wxGraphicsContext is it's not available.
Closes #12966.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66995
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 22 Feb 2011 13:25:51 +0000 (13:25 +0000)]
Put storage class outside WXDLLIMPEXP_DATA_CORE() macros.
The storage class must come first in a declaration so put it in front of
WXDLLIMPEXP_DATA_CORE() and not inside it to avoid warnings from some
compilers (notably Intel one).
Closes #12932.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66994
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 22 Feb 2011 13:25:38 +0000 (13:25 +0000)]
Remove duplicated control names strings declarations from wxOSX.
There is no need to declare wxFooNameStr constants in wx/osx/foo.h files as
they are already declared in wx/foo.h.
Also remove a couple of header/forward declarations unnecessary for the same
reason.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66993
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Vadim Zeitlin [Tue, 22 Feb 2011 13:25:30 +0000 (13:25 +0000)]
Move wxCheckBoxNameStr declarations to wx/tglbtn.h from wx/port/tglbtn.h.
Don't duplicate wxCheckBoxNameStr declarations in all ports.
Of course, the question still remains why does wxToggleButton use
wxCheckBoxNameStr and not a specific name in the first place.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66992
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Václav Slavík [Sun, 20 Feb 2011 18:18:51 +0000 (18:18 +0000)]
Put normal space between Back and Next buttons in wxWizard.
Use regular space between these two buttons even on Windows, where they
were previously close together. This used to be done in older Windows
versions, but modern Windows HIG documents show wizards with equal
spacing between all buttons and that's what Windows OS itself does. In
other words, not treating this pair of buttons specially is more native.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66985
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Julian Smart [Sun, 20 Feb 2011 12:05:13 +0000 (12:05 +0000)]
Corrected a hit test problem when tabs are present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66984
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sun, 20 Feb 2011 06:31:12 +0000 (06:31 +0000)]
handling nil images correctly, solves #12956
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66979
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 19 Feb 2011 16:18:55 +0000 (16:18 +0000)]
appeasing clang
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66978
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
Stefan Csomor [Sat, 19 Feb 2011 14:51:27 +0000 (14:51 +0000)]
only draw separator line on the area adjacent to content, avoids double frames
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66977
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775