Commit Graph

171 Commits

Author SHA1 Message Date
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
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
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
Vadim Zeitlin
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:39:52 +00:00
Vadim Zeitlin
f915b92e09 fix ownerdrawn button label drawing in ODS_NOACCEL case (#3519)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-19 07:50:44 +00:00
Vadim Zeitlin
433aca2d0d extract button size calculation from button label size to a separate function to allow reusing it elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-05 14:10:50 +00:00
Vadim Zeitlin
4af4dec65f compilation fix for PCH-less build; also moved some functions out of line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-03 12:24:25 +00:00
Vadim Zeitlin
9016f3ad73 add support for multiline labels in wxToggleButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-03 11:47:01 +00:00
Vadim Zeitlin
533171c287 support multiline labels in wxCheckBox (#9495)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-07 01:54:44 +00:00
Vadim Zeitlin
627c8d8993 correction after the previous commit which introduced bug 1888014
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-06 19:57:19 +00:00
Vadim Zeitlin
9617f65bcc fix GetTLWParentIfNotBeingDeleted() to work correctly even if an intermediate non-TLW parent is being deleted, it should still return the TLW parent and not NULL in this case, otherwise we'd crash when a button child of a panel being deleted is current temporary default button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-06 13:56:23 +00:00
Vadim Zeitlin
d94de683a6 update button style to include BS_MULTILINE when a multiline label is set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-29 13:38:34 +00:00
Vadim Zeitlin
c4e1d0fc47 no changes, just removed unnecessary #ifdef __WIN32__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-29 13:16:32 +00:00
Václav Slavík
e0a050e347 more changes to make wx compile without implicit wxString->char* conversion (for STL build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-20 07:44:45 +00:00
Vadim Zeitlin
05c5f28144 don't try to update TLW default button in WM_SET/KILLFOCUS handlers if the TLW is being deleted (bug 1660913)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-11 12:58:55 +00:00
Vadim Zeitlin
ebc0b15552 compilation fix after last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-09 12:19:12 +00:00
Vadim Zeitlin
94aff5ff86 Call wxTLW::SetDefaultItem() from wxButtonBase::SetDefault() instead of doing
it in wxButton implementations in (almost) all ports; changed its return type
to "wxWindow *" from "void" to accommodate the ports needing the old default
item (replaces part of patch 1696563)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-08 22:18:35 +00:00
Chris Elliott
047aa29670 fix borland error about string refernce
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-13 12:12:55 +00:00
Vadim Zeitlin
32cd189dfc use GetLabelText() instead of wxStripMenuCodes() to avoid stripping the part of the string after TAB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-25 18:47:39 +00:00
Włodzimierz Skiba
b84aec037f PCH build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-25 06:07:01 +00:00
Vadim Zeitlin
6c20e8f816 move default button handling code from wxControlContainer to wxTLW (patch 1524441)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-25 01:31:13 +00:00
Vadim Zeitlin
789367e10d unset the button as temporary default item when it's destroyed (closes bug 1354875)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-16 19:50:48 +00:00
Vadim Zeitlin
cef55d6485 remove the search for parent with wxTAB_TRAVERSAL style in SetDefaultStyle(): it's useless as DM_SETDEFID can be only sent to the immediate parent anyhow, apparently
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-16 19:23:03 +00:00
Robin Dunn
4e9da8b79e Forward port of changes for using themed drawing of owner-drawn buttons.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-31 21:26:39 +00:00
Włodzimierz Skiba
f1e0171631 Include wx/button.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-17 09:07:47 +00:00
Julian Smart
9f8130d6b3 Must strip menu codes from labels before measuring (fixes bug 1400552)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:16:36 +00:00
David Surovell
61e6a2ab5e fix MinGW/gcc compilation issue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-28 23:40:21 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Vadim Zeitlin
cbbb6724af fixed drawing of owner drawn buttons with multiline labels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-22 22:53:11 +00:00
Robin Dunn
31582e4e11 Patch #1203934: enable best size caching for MSW widgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-18 02:23:01 +00:00
Robin Dunn
0c8b041f14 Use the current font for the DoGetBestSize calculation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-02 03:58:21 +00:00
Vadim Zeitlin
c4e2838090 use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGetBestSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-15 00:37:12 +00:00
Julian Smart
c87fc2859d Don't use mnemonics for OK, Cancel and Close under Windows, to follow
style guidelines


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-11 09:19:34 +00:00
Robert Roebling
2376eee248 Corrected button height for multiline buttons.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-10 20:29:19 +00:00
Václav Slavík
5f7bcb48fd new stock buttons API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-30 14:42:51 +00:00
Włodzimierz Skiba
fcf90ee1b1 Source cleaning: whitespaces,-1/wxID_ANY,TRUE/true,FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-19 17:39:28 +00:00
Vadim Zeitlin
87b6002d7c typo/spelling fixes (patch 983448)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-04 11:19:47 +00:00
Václav Slavík
7a5e53abb3 fixed warnings after GetFont prototype change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-24 14:25:47 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Vadim Zeitlin
af498247c5 make XTI compile with VC6 (patch 896614)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-15 22:51:57 +00:00
Julian Smart
c140b7e7c9 Applied patch [ 903619 ] Win64 and Itanium support
by Brian Palmer


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-25 10:45:02 +00:00
Julian Smart
8cc4850c2d Patch from "Viktor Voroshylo" <viktor@voroshylo.com>
src/.cvsignore : changes to ignore temorary project files
src/regex/.cvsignore : changes to ignore temorary project files for CE compiler
src/regex/regguts.h : assert will be ignored under WinCE
src/msw/button.cpp : BS_FLAT is not available under winCE
src/msw/clipbrd.cpp : changed CLIPFORMAT to wxDataFormat::NativeFormat so it will compile when ole is not included (under winCE)
src/msw/menu.cpp : GetMenuItemCount is not available under winCE. Using wxMenu::GetMenuCount in this case
src/common/regex.cpp : regex will be included under wince
include/wx/msw/wince/setup.h : wxUSE_THREADS & wxUSE_REGEX is enabled by default (as in standard windows configuration)
src/msw/wince/wxWindowsCE.vcp: fixed problem with all configurations (except emu once) do not have procompiled headers setup correctly. Changes for compiling with regex.
src/msw/wince/wxWindowsCE.vcw : added regex in workspace file


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-27 17:47:37 +00:00
Julian Smart
6463b9f539 Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 13:49:22 +00:00
Julian Smart
1169a91932 Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom
(Watcom compiler doesn't like ctor implementation in headers)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 15:33:01 +00:00
Julian Smart
8a094d7ba9 Applied patch [ 874495 ] wxMSW: Flat buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 11:47:23 +00:00
Vadim Zeitlin
cb0afb2662 replaced wxNO_FULL_REPAINT_ON_RESIZE with wxFULL_REPAINT_ON_RESIZE in XTI declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 00:41:06 +00:00
Stefan Csomor
3ff066a4ec macro naming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-04 01:19:40 +00:00
Stefan Csomor
ffca575c83 WX_EVENT_PROPERTY instead of WX_DELEGATE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-27 18:42:14 +00:00
Stefan Csomor
e70b4f1095 unicode adaptions, menu support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-25 23:33:36 +00:00