Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,336 Commits 1 Branch 330 Tags
8cb03510a15d9b9d2c93ea7411c84a426884aab3
Commit Graph

134 Commits

Author SHA1 Message Date
Václav Slavík
8cb03510a1 Determine wxButton size correctly in wxMSW. 
Instead of using default size for default GUI font, use the default font
for this dialog's current font.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-24 11:51:00 +00:00
Vadim Zeitlin
4b601a59b5 Fix best size computation for buttons without image and with empty label. 
If a button was initially created with an empty label (but without image
neither), its best size was computed and cached as being null. Correct this by
giving the button the default size instead, as expected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-22 15:37:37 +00:00
Václav Slavík
bdf14bff10 PCH compilation fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-15 11:24:17 +00:00
Vadim Zeitlin
eb74a51f7e No changes, just add a comment to the button focus handling code. 
The workarounds for the button focus issues should become unnecessary if we
switch to setting the focus correctly as explained in the linked post.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-27 16:44:16 +00:00
Vadim Zeitlin
e431c7df61 Always correctly invalid best size when bitmap changes. 
Previously it was done only when the initial bitmap was set, not when it was
subsequently changed.

Closes #11018.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-23 23:01:10 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT(). 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-23 20:30:22 +00:00
Vadim Zeitlin
86ac84b8ce don't draw borders for bitmap buttons with wxBORDER_NONE style 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-18 17:13:51 +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
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
Vadim Zeitlin
958e4b4b75 added missing int 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-15 22:36:57 +00:00
Vadim Zeitlin
d5b98eb928 implement support for per-state bitmaps in wxMSW wxButton 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-15 20:18:10 +00:00
Vadim Zeitlin
8f4745feeb implement button support for pre-XP systems (or with themes disabled); using only the normal bitmap so far 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-15 19:21:49 +00:00
Vadim Zeitlin
9c956c0a59 no real changes, just use AutoHXXX classes instead of manually creating/deleting objects in owner drawing code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-15 17:53:58 +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
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