Commit Graph

59265 Commits

Author SHA1 Message Date
Václav Slavík
10018c1de0 Don't break other toolbars with wxToolBar::OSXSetSelectableTools()
wxOSX's implementation used a shared global delegate for all toolbars,
which is not only highly unusual, but broke with code that modified the
delegate. Specifically, wxPreferencesEditor's window uses
OSXSetSelectableTools() to make its toolbar selectable. Because the
delegate was shared, all toolbars in the application would start
behaving as selectable as soon as the user opened preferences (even
after the preferences window was closed).

Don't share the delegate. Create a unique copy and store it in
wxNSToolbar instance. This isn't particularly elegant solution, but it
has the advantage of being binary compatible and simple.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-25 16:10:23 +00:00
Václav Slavík
5d0c8c9302 Make toggle toolbar button emulation on OS X nicer
Actually use gray background behind toggled icon. Remove the ugly black
frame. Increase rounded rectangle's radius so that it is (barely)
visible that the rectangle is rounded.

Previously, the code used wxLIGHT_GREY by mistake, which is the same
color as the toolbar already uses, so toggled items were rendered with
the same background as untoggled, only with an ugly black rectangle
around them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-25 12:29:22 +00:00
Vadim Zeitlin
73eaaa97c3 Fix compilation of generic renderer DrawGauge() in non-PCH build.
Include "wx/msw/wrapwin.h" explicitly to get the declaration of MulDiv()
needed since the changes of r77748.

Closes #16577.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-24 14:55:16 +00:00
Julian Smart
08f4911e73 Fixes for visibility, GetVisibleLineForCaretPosition, and bitmap drawing slowness
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-24 12:59:11 +00:00
Julian Smart
550b039d6c Improved search text control height and position on Windows.
Was previously much too tall (regression from 3.0).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-24 12:52:54 +00:00
Julian Smart
c7ca903834 Corrected border size for wxBORDER_THEME
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-24 12:48:56 +00:00
Paul Cornett
7f7c619c85 avoid duplicate initialization and warnings about initialization order
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-24 03:39:30 +00:00
Robin Dunn
175c299666 Add cairo_image_surface_get_[width|height] to the wxCairo dynamic importer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-24 02:03:50 +00:00
Vadim Zeitlin
1b9caedbcd Detabify the new wxX11 clipboard sources.
No changes, just whitespace cleanup.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:45:15 +00:00
Vadim Zeitlin
01c1dde264 Avoid deprecated wxPen/wxBrush/wxFont API in wxX11 code.
Also simplify the code by relying on implicit constructors of wxPen and
wxBrush from wxColour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:45:10 +00:00
Vadim Zeitlin
db2ecf57cc Avoid signed/unsigned comparison warnings.
Also declare the variable only used inside the loop in the loop statement
itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:45:01 +00:00
Vadim Zeitlin
367210aded Remove unused TRACE_CLIPBOARD variable from wxX11 wxClipboard code.
wxLogTrace() calls using this apparently were removed, so remove the trace
mask as well to avoid "unused variable" warnings about it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:59 +00:00
Vadim Zeitlin
7b210ef041 Remove trivial difference with master before merge.
Somehow an empty line got removed in the AUI sample, restore it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:56 +00:00
Vadim Zeitlin
f257a110c5 Remove accidentally committed swap file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:53 +00:00
Vadim Zeitlin
e6a6bc71db Initialize the member at first, make sure it would not cause segementation fault on the platform that not define wxHAS_RAW_BITMAP, the true init and assign function called within it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:50 +00:00
Vadim Zeitlin
cf5c6861a7 remove these codes. The code could not work correctly under x11. Redesigning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:47 +00:00
Vadim Zeitlin
98c68150ed no changes, add more specific description of these tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:45 +00:00
Vadim Zeitlin
72a90d051a store the raw data in bitmap to m_buffer that in wxCairoBitmapData
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:41 +00:00
Vadim Zeitlin
7d6abbffb8 merge to independent preprocessor to one check.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:39 +00:00
Vadim Zeitlin
999150a45a let wxCairoContext could create cairo context correctly under x11 in this constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:36 +00:00
Vadim Zeitlin
fae6a86a49 This statement that will cause segmentation fault before. Now it ok and enable it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:30 +00:00
Vadim Zeitlin
7b3774444b remove unnecessary Clear() and wrong delete
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:28 +00:00
Vadim Zeitlin
5a6c061f37 use wxCharTypeBuffer replace unsigned char pointer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:25 +00:00
Vadim Zeitlin
b3c88024e8 delete variable on stack is wrong, remove it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:22 +00:00
Vadim Zeitlin
cae31c23f3 remove unnessary internal variables, parameters; use wxVector replace c++ array; enable implemented function parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:19 +00:00
Vadim Zeitlin
dea35139cd adjust codes according to comments of Catalin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:16 +00:00
Vadim Zeitlin
fc3b0de9cc add return to a case statment, make sure it is not fall through to other statment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:14 +00:00
Vadim Zeitlin
116d57e850 add WXX11 check. make sure only reposition scrollbar under x11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:11 +00:00
Vadim Zeitlin
463df5a58a use cairo implement rotated text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:08 +00:00
Vadim Zeitlin
51309ad50a make x11 dc could get cairo context, so the graphic module could use in x11. This use cairo xlib backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:06 +00:00
Vadim Zeitlin
3704547684 fix complilation error: narrowing conversions in xbm files under wxX11. For discussion, please see ticket 12575
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:44:01 +00:00
Vadim Zeitlin
24486d69a8 update wxBrush and wxPen style in x11/dcclient.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:53 +00:00
Vadim Zeitlin
0d4eb27a0e wxSTC need to reposition the scrollbar when recive size change event.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:51 +00:00
Vadim Zeitlin
be22f9e634 change the size of checkbox and radiobutton, the 14*14 is most common used size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:48 +00:00
Vadim Zeitlin
b045f9506b Rewrite the wxX11 cliboard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:44 +00:00
Vadim Zeitlin
42d5c34c64 x11 alrady support GetUnicodeKey() by last commit, remove these check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:41 +00:00
Vadim Zeitlin
ad84d9f97d make wxKeyEvent could get unicode key under x11, add a x11 keysym--unicode char map tab
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:37 +00:00
Vadim Zeitlin
3873c4db75 improve the commit according the comments of Catalin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:33 +00:00
Vadim Zeitlin
f7beec1025 we must store the to be focused window before we kill focus on a window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:30 +00:00
Vadim Zeitlin
83c0fca8da Remove the dead code that copied from gtk1 port. And initial implementation of x11 clipboard support. It only support text for now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:27 +00:00
Vadim Zeitlin
d956d87f2e enable wxNEEDS_UTF8_FOR_TEXT_DATAOBJ flag for x11 TextDataObject, and add implementation of GetAllFormat function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:24 +00:00
Vadim Zeitlin
0e998def86 Should not send event again when mouse release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:18 +00:00
Vadim Zeitlin
d6ae3804dd input handler should coreesponding the widget instance, wxListBox and wxCheckListBox has its own input handler, so create it differenctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:15 +00:00
Vadim Zeitlin
786c64e040 refine the condition check and correct a check condition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:12 +00:00
Vadim Zeitlin
17c3ad1914 wxX11 could not get UnicodeKey yet, not wxUniversal. And use AND instead OR. otherwise the check not work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:09 +00:00
Vadim Zeitlin
813c7a15c1 add wxYield to make sure all event was executed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:06 +00:00
Vadim Zeitlin
3d317ceb84 Modifiers down should not generate wxEVT_CHAR event, and reset keyboardState when recieve modifiers up.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:04 +00:00
Vadim Zeitlin
d9b73c6365 refine the implementation of SetFocus, clean up unused static variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:43:01 +00:00
Vadim Zeitlin
f6fdfe8ebc about focused window, replace static variables implementation by DoFindFocus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:42:58 +00:00
Vadim Zeitlin
adf61108be wxX11 return keycode by GetKeyCode directly, not support GetUnicodeKey yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-23 17:42:54 +00:00