X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/067e9be6852644c258627eb745643f8efd711e60..814863411d4a10ca3bbe9a330b46103e9852a232:/src/msw/button.cpp diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 8ee6217a77..0c07934f05 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -40,6 +40,8 @@ #include "wx/dcscreen.h" #endif +#include "wx/stockitem.h" +#include "wx/tokenzr.h" #include "wx/msw/private.h" // ---------------------------------------------------------------------------- @@ -48,72 +50,59 @@ #if wxUSE_EXTENDED_RTTI -enum wxButtonStyleBits -{ - wxButtonExactFitBit = 0 , - wxButtonLeftBit = 6 , - wxButtonTopBit = 7 , - wxButtonRightBit = 8 , - wxButtonBottomBit = 9 , - -// wxNoFullRepaintOnResizeBit = 16 , -// wxPopUpWindowBit = 17 , - wxWantCharsBit = 18 , -// wxTabTraversalBit = 19 , - - wxTransparentWindowBit = 20 , - wxBorderNoneBit = 21 , -// wxClipChildrenBit = 22 , -// wxAlwaysShowScrollBarsBit = 23 , - - wxBorderStaticBit = 24 , - wxBorderSimpleBit = 25 , - wxBorderRaisedBit = 26 , - wxBorderSunkenBit = 27 , - - wxBorderDoubleBit = 28 , -// wxCaptionBit = 29 , -// wxClipSiblingsBit = 29 , // caption not used for non toplevel -// wxHScrolBit = 30 , -// wxVScrollBit = 31 , -} ; - -typedef wxFlags wxButtonStyleFlags ; - -WX_BEGIN_ENUM( wxButtonStyleBits) - WX_ENUM_MEMBER( wxButtonExactFitBit) - WX_ENUM_MEMBER( wxButtonLeftBit) - WX_ENUM_MEMBER( wxButtonTopBit) - WX_ENUM_MEMBER( wxButtonRightBit) - WX_ENUM_MEMBER( wxButtonBottomBit) - WX_ENUM_MEMBER( wxWantCharsBit) - WX_ENUM_MEMBER( wxTransparentWindowBit) - WX_ENUM_MEMBER( wxBorderNoneBit) - WX_ENUM_MEMBER( wxBorderStaticBit) - WX_ENUM_MEMBER( wxBorderSimpleBit) - WX_ENUM_MEMBER( wxBorderRaisedBit) - WX_ENUM_MEMBER( wxBorderSunkenBit) - WX_ENUM_MEMBER( wxBorderDoubleBit) -WX_END_ENUM( wxButtonStyleBits) - -WX_IMPLEMENT_SET_STREAMING( wxButtonStyleFlags , wxButtonStyleBits) +WX_DEFINE_FLAGS( wxButtonStyle ) + +wxBEGIN_FLAGS( wxButtonStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxBU_LEFT) + wxFLAGS_MEMBER(wxBU_RIGHT) + wxFLAGS_MEMBER(wxBU_TOP) + wxFLAGS_MEMBER(wxBU_BOTTOM) + wxFLAGS_MEMBER(wxBU_EXACTFIT) +wxEND_FLAGS( wxButtonStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h") -WX_BEGIN_PROPERTIES_TABLE(wxButton) - WX_DELEGATE( OnClick , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +wxBEGIN_PROPERTIES_TABLE(wxButton) + wxEVENT_PROPERTY( Click , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent) - WX_PROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - WX_PROPERTY( Label, wxString , SetLabel, GetLabel, wxEmptyString, 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Label, wxString , SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) - WX_PROPERTY_FLAGS( WindowStyle , wxButtonStyleFlags , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + wxPROPERTY_FLAGS( WindowStyle , wxButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -WX_END_PROPERTIES_TABLE() +wxEND_PROPERTIES_TABLE() -WX_BEGIN_HANDLERS_TABLE(wxButton) -WX_END_HANDLERS_TABLE() +wxBEGIN_HANDLERS_TABLE(wxButton) +wxEND_HANDLERS_TABLE() -WX_CONSTRUCTOR_6( wxButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) +wxCONSTRUCTOR_6( wxButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) #else @@ -134,15 +123,30 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) bool wxButton::Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& lbl, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + wxString label(lbl); + if (label.empty() && wxIsStockID(id)) + { + // On Windows, some buttons aren't supposed to have + // mnemonics, so strip them out. + + label = wxGetStockLabel(id +#if defined(__WXMSW__) || defined(__WXWINCE__) + , ( id != wxID_OK && + id != wxID_CANCEL && + id != wxID_CLOSE ) +#endif + ); + } + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) - return FALSE; + return false; WXDWORD exstyle; WXDWORD msStyle = MSWGetStyle(style, &exstyle); @@ -196,6 +200,11 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const msStyle |= BS_TOP; if ( style & wxBU_BOTTOM ) msStyle |= BS_BOTTOM; +#ifndef __WXWINCE__ + // flat 2d buttons + if ( style & wxNO_BORDER ) + msStyle |= BS_FLAT; +#endif // __WXWINCE__ #endif // __WIN32__ return msStyle; @@ -207,18 +216,39 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const wxSize wxButton::DoGetBestSize() const { - int wBtn; - GetTextExtent(wxGetWindowText(GetHWND()), &wBtn, NULL); + int wBtn = 0; + int wChar, hChar, hBtn; + wxGetCharSize(GetHWND(), &wChar, &hChar, GetFont()); + + wxString label = wxGetWindowText(GetHWND()); + if ( label.find(_T('\n')) != wxString::npos ) + { + wxStringTokenizer tokens( label, wxT("\n") ); - int wChar, hChar; - wxGetCharSize(GetHWND(), &wChar, &hChar, &GetFont()); + // the button height is proportional to the height of the font used + hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar); + hBtn += hChar*(tokens.CountTokens()-1); + + while (tokens.HasMoreTokens()) + { + wxString sub = tokens.GetNextToken(); + int w; + GetTextExtent( sub, &w, NULL); + if (w > wBtn) + wBtn = w; + } + } + else + { + GetTextExtent( label, &wBtn, NULL); + // the button height is proportional to the height of the font used + hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar); + } + // add a margin -- the button is wider than just its label wBtn += 3*wChar; - // the button height is proportional to the height of the font used - int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar); - // all buttons have at least the standard size unless the user explicitly // wants them to be of smaller size and used wxBU_EXACTFIT style when // creating the button @@ -293,7 +323,7 @@ wxSize wxButtonBase::GetDefaultSize() NB: all this is quite complicated by now and the worst is that normally it shouldn't be necessary at all as for the normal Windows programs DefWindowProc() and IsDialogMessage() take care of all this - automatically -- however in wxWindows programs this doesn't work for + automatically -- however in wxWidgets programs this doesn't work for nested hierarchies (i.e. a notebook inside a notebook) for unknown reason and so we have to reproduce all this code ourselves. It would be very nice if we could avoid doing it. @@ -306,12 +336,12 @@ void wxButton::SetDefault() wxCHECK_RET( parent, _T("button without parent?") ); - // set this one as the default button both for wxWindows ... + // set this one as the default button both for wxWidgets ... wxWindow *winOldDefault = parent->SetDefaultItem(this); // ... and Windows - SetDefaultStyle(wxDynamicCast(winOldDefault, wxButton), FALSE); - SetDefaultStyle(this, TRUE); + SetDefaultStyle(wxDynamicCast(winOldDefault, wxButton), false); + SetDefaultStyle(this, true); } // set this button as being currently default @@ -324,8 +354,8 @@ void wxButton::SetTmpDefault() wxWindow *winOldDefault = parent->GetDefaultItem(); parent->SetTmpDefaultItem(this); - SetDefaultStyle(wxDynamicCast(winOldDefault, wxButton), FALSE); - SetDefaultStyle(this, TRUE); + SetDefaultStyle(wxDynamicCast(winOldDefault, wxButton), false); + SetDefaultStyle(this, true); } // unset this button as currently default, it may still stay permanent default @@ -339,8 +369,8 @@ void wxButton::UnsetTmpDefault() wxWindow *winOldDefault = parent->GetDefaultItem(); - SetDefaultStyle(this, FALSE); - SetDefaultStyle(wxDynamicCast(winOldDefault, wxButton), TRUE); + SetDefaultStyle(this, false); + SetDefaultStyle(wxDynamicCast(winOldDefault, wxButton), true); } /* static */ @@ -421,12 +451,12 @@ void wxButton::Command(wxCommandEvent & event) bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { - bool processed = FALSE; + bool processed = false; switch ( param ) { // NOTE: Apparently older versions (NT 4?) of the common controls send // BN_DOUBLECLICKED but not a second BN_CLICKED for owner-drawn - // buttons, so in order to send two EVET_BUTTON events we should + // buttons, so in order to send two EVT_BUTTON events we should // catch both types. Currently (Feb 2003) up-to-date versions of // win98, win2k and winXP all send two BN_CLICKED messages for // all button types, so we don't catch BN_DOUBLECLICKED anymore @@ -443,9 +473,9 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return processed; } -long wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - // when we receive focus, we want to temporary become the default button in + // when we receive focus, we want to temporarily become the default button in // our parent panel so that pressing "Enter" would activate us -- and when // losing it we should restore the previous default button as well if ( nMsg == WM_SETFOCUS ) @@ -518,14 +548,14 @@ bool wxButton::SetBackgroundColour(const wxColour &colour) if ( !wxControl::SetBackgroundColour(colour) ) { // nothing to do - return FALSE; + return false; } MakeOwnerDrawn(); Refresh(); - return TRUE; + return true; } bool wxButton::SetForegroundColour(const wxColour &colour) @@ -533,14 +563,14 @@ bool wxButton::SetForegroundColour(const wxColour &colour) if ( !wxControl::SetForegroundColour(colour) ) { // nothing to do - return FALSE; + return false; } MakeOwnerDrawn(); Refresh(); - return TRUE; + return true; } /* @@ -600,7 +630,7 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn, DrawRect(hdc, r); (void)SelectObject(hdc, hpenGrey); - InflateRect(&r, -1, -1); + ::InflateRect(&r, -1, -1); DrawRect(hdc, r); } @@ -610,7 +640,7 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn, { DrawRect(hdc, r); - InflateRect(&r, -1, -1); + ::InflateRect(&r, -1, -1); } wxDrawLine(hdc, r.left, r.bottom, r.right, r.bottom); @@ -693,7 +723,7 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) ::DeleteObject(hbrushBackground); - return TRUE; + return true; } #endif // __WIN32__