X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be4017f89bcffe7773934677f11964465e40c87a..4b2424bcadbc87babd3367d243b957e49333eeae:/src/msw/button.cpp diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 5c30bf807b..5cb83273d7 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_BUTTON + #ifndef WX_PRECOMP #include "wx/button.h" #include "wx/brush.h" @@ -66,62 +68,47 @@ bool wxButton::Create(wxWindow *parent, const wxValidator& validator, const wxString& name) { - if ( !CreateBase(parent, id, pos, size, style, validator, name) ) + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return FALSE; - parent->AddChild((wxButton *)this); - - m_backgroundColour = parent->GetBackgroundColour(); - m_foregroundColour = parent->GetForegroundColour(); - - - m_hWnd = (WXHWND)CreateWindowEx - ( - MakeExtendedStyle(m_windowStyle), - wxT("BUTTON"), - label, - WS_VISIBLE | WS_TABSTOP | WS_CHILD, - 0, 0, 0, 0, - GetWinHwnd(parent), - (HMENU)m_windowId, - wxGetInstance(), - NULL - ); + return MSWCreateControl(_T("BUTTON"), label, pos, size, style); +} - // Subclass again for purposes of dialog editing mode - SubclassWin(m_hWnd); +wxButton::~wxButton() +{ +} - SetFont(parent->GetFont()); +// ---------------------------------------------------------------------------- +// flags +// ---------------------------------------------------------------------------- - SetSize(pos.x, pos.y, size.x, size.y); +WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + // buttons never have an external border, they draw their own one + WXDWORD msStyle = wxControl::MSWGetStyle + ( + (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle + ); - // bad hack added by Robert to make buttons at least - // 80 pixels wide. There are probably better ways... - // TODO. FIXME. - wxSize nsize( GetSize() ); - if ((nsize.x < 80) || (nsize.y < 23)) - { - if ((size.x == -1) && (nsize.x < 80)) - nsize.x = 80; - if ((size.y == -1) && (nsize.y < 23)) - nsize.y = 23; - SetSize( nsize ); - } + // we must use WS_CLIPSIBLINGS with the buttons or they would draw over + // each other in any resizeable dialog which has more than one button in + // the bottom + msStyle |= WS_CLIPSIBLINGS; - return TRUE; -} +#ifdef __WIN32__ + // don't use "else if" here: weird as it is, but you may combine wxBU_LEFT + // and wxBU_RIGHT to get BS_CENTER! + if ( style & wxBU_LEFT ) + msStyle |= BS_LEFT; + if ( style & wxBU_RIGHT ) + msStyle |= BS_RIGHT; + if ( style & wxBU_TOP ) + msStyle |= BS_TOP; + if ( style & wxBU_BOTTOM ) + msStyle |= BS_BOTTOM; +#endif // __WIN32__ -wxButton::~wxButton() -{ - wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); - if ( panel ) - { - if ( panel->GetDefaultItem() == this ) - { - // don't leave the panel with invalid default item - panel->SetDefaultItem(NULL); - } - } + return msStyle; } // ---------------------------------------------------------------------------- @@ -143,18 +130,22 @@ wxSize wxButton::DoGetBestSize() const // the button height is proportional to the height of the font used int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar); - return wxSize(wBtn, hBtn); + wxSize sz = GetDefaultSize(); + if (wBtn > sz.x) sz.x = wBtn; + if (hBtn > sz.y) sz.y = hBtn; + + return sz; } /* static */ -wxSize wxButton::GetDefaultSize() +wxSize wxButtonBase::GetDefaultSize() { static wxSize s_sizeBtn; if ( s_sizeBtn.x == 0 ) { wxScreenDC dc; - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); // the size of a standard button in the dialog units is 50x14, // translate this to pixels @@ -178,20 +169,20 @@ wxSize wxButton::GetDefaultSize() void wxButton::SetDefault() { wxWindow *parent = GetParent(); - wxButton *btnOldDefault = NULL; - wxPanel *panel = wxDynamicCast(parent, wxPanel); - if ( panel ) + wxButton *btnOldDefault; + if ( parent ) { - btnOldDefault = panel->GetDefaultItem(); - panel->SetDefaultItem(this); - } + wxWindow *winOldDefault = parent->SetDefaultItem(this); + btnOldDefault = wxDynamicCast(winOldDefault, wxButton); - if ( parent ) + ::SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L); + } + else // is a button without parent really normal? { - SendMessage(GetWinHwnd(parent), DM_SETDEFID, m_windowId, 0L); + btnOldDefault = NULL; } - if ( btnOldDefault ) + if ( btnOldDefault && btnOldDefault != this ) { // remove the BS_DEFPUSHBUTTON style from the other button long style = GetWindowLong(GetHwndOf(btnOldDefault), GWL_STYLE); @@ -241,13 +232,14 @@ void wxButton::Command(wxCommandEvent & event) // event/message handlers // ---------------------------------------------------------------------------- -bool wxButton::MSWCommand(WXUINT param, WXWORD id) +bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { bool processed = FALSE; switch ( param ) { - case 1: // means that the message came from an accelerator - case BN_CLICKED: + case 1: // message came from an accelerator + case BN_CLICKED: // normal buttons send this + case BN_DOUBLECLICKED: // owner-drawn ones also send this processed = SendClickEvent(); break; } @@ -265,6 +257,14 @@ long wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) // let the default processign take place too } + else if ( nMsg == WM_LBUTTONDBLCLK ) + { + // emulate a click event to force an owner-drawn button to change its + // appearance - without this, it won't do it + (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam); + + // and conitnue with processing the message normally as well + } // let the base class do all real processing return wxControl::MSWWindowProc(nMsg, wParam, lParam); @@ -305,7 +305,7 @@ static void DrawRect(HDC hdc, const RECT& r) void wxButton::MakeOwnerDrawn() { long style = GetWindowLong(GetHwnd(), GWL_STYLE); - if ( !(style & BS_OWNERDRAW) ) + if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW ) { // make it so style |= BS_OWNERDRAW; @@ -347,10 +347,11 @@ bool wxButton::SetForegroundColour(const wxColour &colour) The button frame looks like this normally: WWWWWWWWWWWWWWWWWWB - W GB - W GB - W GB where W, G, B are white, grey and black pixels - W GB + WHHHHHHHHHHHHHHHHGB W = white (HILIGHT) + WH GB H = light grey (LIGHT) + WH GB G = dark grey (SHADOW) + WH GB B = black (DKSHADOW) + WH GB WGGGGGGGGGGGGGGGGGB BBBBBBBBBBBBBBBBBBB @@ -359,8 +360,9 @@ bool wxButton::SetForegroundColour(const wxColour &colour) BBBBBBBBBBBBBBBBBBB BWWWWWWWWWWWWWWWWBB - BW GBB - BW GBB + BWHHHHHHHHHHHHHHGBB + BWH GBB + BWH GBB BWGGGGGGGGGGGGGGGBB BBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBB @@ -372,6 +374,7 @@ bool wxButton::SetForegroundColour(const wxColour &colour) BG GB BG GB BG GB + BG GB BGGGGGGGGGGGGGGGGGB BBBBBBBBBBBBBBBBBBB */ @@ -382,9 +385,10 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn, RECT r; CopyRect(&r, &rectBtn); - HPEN hpenBlack = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DDKSHADOW)), - hpenGrey = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW)), - hpenWhite = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DHILIGHT)); + HPEN hpenBlack = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DDKSHADOW)), + hpenGrey = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW)), + hpenLightGr = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DLIGHT)), + hpenWhite = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DHILIGHT)); HPEN hpenOld = (HPEN)SelectObject(hdc, hpenBlack); @@ -418,6 +422,11 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn, LineTo(hdc, r.left, r.top); LineTo(hdc, r.right, r.top); + (void)SelectObject(hdc, hpenLightGr); + MoveToEx(hdc, r.left + 1, r.bottom - 2, NULL); + LineTo(hdc, r.left + 1, r.top + 1); + LineTo(hdc, r.right - 1, r.top + 1); + (void)SelectObject(hdc, hpenGrey); MoveToEx(hdc, r.left + 1, r.bottom - 1, NULL); LineTo(hdc, r.right - 1, r.bottom - 1); @@ -426,6 +435,7 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn, (void)SelectObject(hdc, hpenOld); DeleteObject(hpenWhite); + DeleteObject(hpenLightGr); DeleteObject(hpenGrey); DeleteObject(hpenBlack); } @@ -475,6 +485,12 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) DrawFocusRect(hdc, &rectFocus); } + if ( pushed ) + { + // the label is shifted by 1 pixel to create "pushed" effect + OffsetRect(&rectBtn, 1, 1); + } + DrawButtonText(hdc, &rectBtn, GetLabel(), state & ODS_DISABLED ? GetSysColor(COLOR_GRAYTEXT) : colFg); @@ -485,3 +501,6 @@ bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis) } #endif // __WIN32__ + +#endif // wxUSE_BUTTON +