X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd0b170911637899ac3c126367ee5821f357c185..0460407f86c7107ff3548afbd846aa8dfd44cc20:/src/msw/button.cpp diff --git a/src/msw/button.cpp b/src/msw/button.cpp index e913563260..d58fda1ac6 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -74,13 +74,25 @@ bool wxButton::Create(wxWindow *parent, m_backgroundColour = parent->GetBackgroundColour(); m_foregroundColour = parent->GetForegroundColour(); + long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD /* | WS_CLIPSIBLINGS */ ; + +#ifdef __WIN32__ + if(m_windowStyle & wxBU_LEFT) + msStyle |= BS_LEFT; + if(m_windowStyle & wxBU_RIGHT) + msStyle |= BS_RIGHT; + if(m_windowStyle & wxBU_TOP) + msStyle |= BS_TOP; + if(m_windowStyle & wxBU_BOTTOM) + msStyle |= BS_BOTTOM; +#endif m_hWnd = (WXHWND)CreateWindowEx ( MakeExtendedStyle(m_windowStyle), wxT("BUTTON"), label, - WS_VISIBLE | WS_TABSTOP | WS_CHILD, + msStyle, 0, 0, 0, 0, GetWinHwnd(parent), (HMENU)m_windowId, @@ -88,6 +100,17 @@ bool wxButton::Create(wxWindow *parent, NULL ); + if (m_hWnd == 0) + { + wxString msg; +#ifdef __WIN16__ + msg.Printf(wxT("CreateWindowEx failed")); +#else + msg.Printf(wxT("CreateWindowEx failed with error number %ld"), (long) GetLastError()); +#endif + wxFAIL_MSG(msg); + } + // Subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); @@ -95,19 +118,6 @@ bool wxButton::Create(wxWindow *parent, SetSize(pos.x, pos.y, size.x, size.y); - // 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 ); - } - return TRUE; } @@ -143,7 +153,11 @@ 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 */ @@ -198,17 +212,26 @@ void wxButton::SetDefault() // don't do it with the owner drawn buttons because it will reset // BS_OWNERDRAW style bit too (BS_OWNERDRAW & BS_DEFPUSHBUTTON != 0)! - if ( !(style & BS_OWNERDRAW) ) + if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW ) { style &= ~BS_DEFPUSHBUTTON; SendMessage(GetHwndOf(btnOldDefault), BM_SETSTYLE, style, 1L); } + else + { + // redraw the button - it will notice itself that it's not the + // default one any longer + btnOldDefault->Refresh(); + } } // set this button as the default long style = GetWindowLong(GetHwnd(), GWL_STYLE); - style |= BS_DEFPUSHBUTTON; - SendMessage(GetHwnd(), BM_SETSTYLE, style, 1L); + if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW ) + { + style |= BS_DEFPUSHBUTTON; + SendMessage(GetHwnd(), BM_SETSTYLE, style, 1L); + } } // ---------------------------------------------------------------------------- @@ -237,8 +260,9 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD 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; } @@ -248,24 +272,21 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD id) long wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - // make sure that we won't have BS_DEFPUSHBUTTON style any more if the - // focus is being transfered to another button with the same parent - - // otherwise, we could finish with 2 default buttons inside one panel - if ( (nMsg == WM_KILLFOCUS) && - (GetWindowLong(GetHwnd(), GWL_STYLE) & BS_DEFPUSHBUTTON) ) + // when we receive focus, we want to become the default button in our + // parent panel + if ( nMsg == WM_SETFOCUS ) { - wxWindow *parent = GetParent(); - wxWindow *win = wxFindWinFromHandle((WXHWND)wParam); - if ( win && win->GetParent() == parent ) - { - wxPanel *panel = wxDynamicCast(parent, wxPanel); - if ( panel ) - { - panel->SetDefaultItem(this); - } - // else: I don't know what to do - we'll still have the problem - // with multiple default buttons in a dialog... - } + SetDefault(); + + // 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 @@ -307,7 +328,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; @@ -349,10 +370,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 @@ -361,8 +383,9 @@ bool wxButton::SetForegroundColour(const wxColour &colour) BBBBBBBBBBBBBBBBBBB BWWWWWWWWWWWWWWWWBB - BW GBB - BW GBB + BWHHHHHHHHHHHHHHGBB + BWH GBB + BWH GBB BWGGGGGGGGGGGGGGGBB BBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBB @@ -374,6 +397,7 @@ bool wxButton::SetForegroundColour(const wxColour &colour) BG GB BG GB BG GB + BG GB BGGGGGGGGGGGGGGGGGB BBBBBBBBBBBBBBBBBBB */ @@ -384,9 +408,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); @@ -420,6 +445,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); @@ -428,6 +458,7 @@ static void DrawButtonFrame(HDC hdc, const RECT& rectBtn, (void)SelectObject(hdc, hpenOld); DeleteObject(hpenWhite); + DeleteObject(hpenLightGr); DeleteObject(hpenGrey); DeleteObject(hpenBlack); } @@ -477,23 +508,18 @@ 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); ::DeleteObject(hbrushBackground); -#if 0 - wxString s = "button state: "; - if ( selected ) - s += "selected "; - if ( pushed ) - s += "pushed "; - if ( state & ODS_FOCUS ) - s += "focused "; - wxLogStatus(s); -#endif - return TRUE; }