Commit Graph

13338 Commits

Author SHA1 Message Date
Vadim Zeitlin
79e38eaf2a set the initial size of bitmap buttons correctly again after it was broken by r61081 (closes #10927)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-27 22:22:48 +00:00
Vadim Zeitlin
886180cdbf suppress warning about implicit conversion of literal string XmSTRING_DEFAULT_CHARSET to non-const char *
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-24 14:49:09 +00:00
Vadim Zeitlin
bb2212e6c4 adjust the toolbar tools bitmap size to fit the biggest bitmap used under wxOSX too, not only under MSW (and moved the code doing it to the common base class to avoid duplicating it)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-23 10:21:18 +00:00
Vadim Zeitlin
12a124ddc9 remove confusing wxDialog::ButtonSizerFlags and extract button styles properly in each generic dialog implementation instead (closes #9836)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-23 08:56:32 +00:00
Vadim Zeitlin
743b426605 Added DoGetClientBestSize() and use it for a couple of controls in wxMSW.
DoGetClientBestSize() returns the best size of the client area, without
accounting for the border which is done by GetBestSize() itself and
DoGetBorderSize() called from it.

Use DoGetClientBestSize() in wxStaticText (where it was done
insideDoGetBestSize() before) and in wxListBox, to fix its height calculation.

Also use correct height of listbox items as returned by the control itself
instead of trying to guess it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-22 20:36:13 +00:00
Jaakko Salli
6edd8829ef Significantly improved wxPropertyGrid's top-level parent change detection code (fixes #10919)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-22 17:02:53 +00:00
Jouk Jansen
ca3b3fbb11 fix for wxGTK1 & bmpbuttn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-21 13:02:52 +00:00
Vadim Zeitlin
e5d05b907c added support for bitmaps in wxButton to wxOSX/Cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-21 03:01:53 +00:00
Kevin Ollivier
2fc9c1ea77 Forward port wxGraphicsBitmap cairo implementation, and fix the credit info in measuring.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-20 23:33:55 +00:00
Vadim Zeitlin
8f2a8de6e7 fix many mostly harmless warnings in wxOSX/Carbon build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-20 00:21:53 +00:00
Vadim Zeitlin
3c01c59511 implement wxTreeCtrl::GetFocusedItem() for wxMSW too (see #10859)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-19 23:48:50 +00:00
Vadim Zeitlin
48889bca6f include wx/arrstr.h as it's needed by wxImageHandler and may not be implicitly included from other headers in minimal builds (closes #10914)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-19 23:46:21 +00:00
Vadim Zeitlin
febebac1a0 added wxTreeCtrl::GetFocusedItem() (closes #10859)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-19 23:34:51 +00:00
Vadim Zeitlin
85284ca4b2 respect wxBU_NOTEXT style in wxButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-19 23:24:51 +00:00
Vadim Zeitlin
09219654cd override DoSetBitmap() instead of SetBitmapLabel()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-19 04:47:59 +00:00
Vadim Zeitlin
03a187ccae wxHtmlWindow background drawing fixes for OS X and optimizations
1. Avoid crashes under OS X due to attempts to copy window contents to the
   backing store bitmap: this doesn't work under OS X so avoid it by always
   painting the background from OnPaint() itself, while still generating the
   erase background events for compatibility.

2. Don't double buffer wxHtmlWindow drawing if the window is already double
   buffered.

3. Don't allocate backing store bitmap on the heap, this is useless as bitmaps
   are already pointer-lile -- so just use invalid bitmap instead of NULL
   bitmap pointer.

4. Update the html/test sample to show the effects of custom erase background
   handler in wxHtmlWindow (it overrides the background bitmap painting).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-18 17:32:20 +00:00
Vadim Zeitlin
69ce9cea39 implement propert background style semantics for OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-18 15:33:51 +00:00
Robin Dunn
a25a17732c Use UTF16 for text data object on Mac. Fixes #10902
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-18 06:18:50 +00:00
Vadim Zeitlin
3c9a70ddd4 correct wrong assert checking for default button flags consistency (closes #10906)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-17 23:16:22 +00:00
Vadim Zeitlin
41550985f2 don't define wxHAS_BUTTON_BITMAP for wxUniv (closes #10907)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-17 23:08:45 +00:00
Vadim Zeitlin
a21175918e added wxBU_NOTEXT style to allow creating bitmap buttons with stock id not showing the label, as it was possible before
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-17 22:13:46 +00:00
Vadim Zeitlin
6e7d2550ce wxFont::MakeXXX() and Scale() methods now modify the font in place; XXX() and Scaled() create new font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-17 21:27:37 +00:00
Julian Smart
a188ac2988 wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-17 21:10:04 +00:00
Jaakko Salli
209bf72273 Setup.h wrapper was missing propgrid section (fixes #10909)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-17 20:38:20 +00:00
Vadim Zeitlin
c753eb9269 implement new wxBG_STYLE_XXX semantics for wxMSW too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-17 04:36:28 +00:00
Vadim Zeitlin
9c61c5b04b introduce wxBG_STYLE_{ERASE,PAINT} and implement their documented semantics in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 23:04:42 +00:00
Vadim Zeitlin
b85b06e13d fix compilation without wxUSE_STREAMS (closes #10900)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 21:57:23 +00:00
Vadim Zeitlin
5dd0965333 remove more occurrences of MSVC #pragma warning(default) (closes #10885)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 21:50:23 +00:00
Vadim Zeitlin
c37dd6dad7 implement wxGTK wxBitmapButton in terms of wxButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 19:31:50 +00:00
Vadim Zeitlin
b4a4eafbcc implement support for bitmaps for all states in wxGTK wxButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 19:08:59 +00:00
Vadim Zeitlin
02bad8305c added helper GTKShouldIgnoreEvent() to use in void GTK event handlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 19:08:24 +00:00
Robert Roebling
9330d5afb6 Many more corrections and clarifications to virtual index list model use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 17:59:09 +00:00
Vadim Zeitlin
eebe696ec9 fix typo in compatibility SetBitmapLabel() declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 15:59:42 +00:00
Vadim Zeitlin
7be740a3fd implement support for button bitmaps (normal state only for now) for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 05:16:31 +00:00
Vadim Zeitlin
23d8a71f51 fix PCH-less build after changing timer id type to WPARAM (closes #10901)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-16 05:05:20 +00:00
Vadim Zeitlin
a6fd73d33a implement wxBitmapButton as just a wrapper for wxButton under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 23:10:16 +00:00
Jaakko Salli
4e00b90802 Added support for wxLongLong and wxULongLong in wxVariant (closes #10166)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 22:43:27 +00:00
Robert Roebling
8ba01d3546 Fix sending wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, fixes #10894: Missing OSX-Carbon DataView control header click events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 18:35:24 +00:00
Vadim Zeitlin
d8c89c487d no real changes, just extract private classes from msw/dc.cpp into a private header so that they could be reused from button owner drawing code too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 17:49:27 +00:00
Vadim Zeitlin
491acfc75e use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is still 32 bit) (see #10896)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 17:14:50 +00:00
Vadim Zeitlin
233f10bf15 implement images support for wxButton under XP and later
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 04:23:54 +00:00
Vadim Zeitlin
81cb7b5a98 include wx/bitmap.h which is required by wxButton now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 03:36:16 +00:00
Vadim Zeitlin
28ac82bf04 added missing parentheses in a couple of GetHxxxOf() macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 03:35:30 +00:00
Vadim Zeitlin
2352862a7e preparation work for implementing images support in wxButton: move wxBitmapButton methods to the base class (enhancing/completing them in the process); there are no functionality changes yet (hopefully)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-14 22:55:24 +00:00
Robert Roebling
e4e83d3ad6 Make wxDataViewModel derive from wxRefCounter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-14 14:11:07 +00:00
Jaakko Salli
cf25a599cd Converted wxVariant to use wxObject's reference counting facilities. Should make sense as wxVariant already derived from wxObject and now wxVariantData inherits wxRefCounter/wxObjectRefData.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-13 14:55:45 +00:00
Robert Roebling
b42d5f7556 Use wxRefCounter instead of wxObjecrDataRef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 20:18:17 +00:00
Robert Roebling
6d37c1b773 Rename wxObjectDataRef wxRefCounter, use it in wxVariant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 20:16:07 +00:00
Vadim Zeitlin
f76c075805 added convenient wxFont::Make{Bold,Italic,Smaller,Larger} and Scale() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 20:11:21 +00:00
Vadim Zeitlin
c797aec4b9 remove unnecessary refCount=1 parameter from wxObjectRefData ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 19:36:58 +00:00