X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97d74dd29510ecec88b3f8cf9c986536f7512a38..fbc1d11bde64cc1cc826fecea7acf99ff288ca2d:/src/os2/button.cpp diff --git a/src/os2/button.cpp b/src/os2/button.cpp index 46892a89fc..3e831bcf91 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -13,6 +13,7 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP + #include "wx/app.h" #include "wx/button.h" #include "wx/brush.h" #include "wx/panel.h" @@ -22,6 +23,7 @@ #include "wx/scrolwin.h" #endif +#include "wx/stockitem.h" #include "wx/os2/private.h" #define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10) @@ -39,19 +41,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) // Button -bool wxButton::Create( - wxWindow* pParent -, wxWindowID vId -, const wxString& rsLabel -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -#if wxUSE_VALIDATORS -, const wxValidator& rValidator -#endif -, const wxString& rsName -) +bool wxButton::Create( wxWindow* pParent, + wxWindowID vId, + const wxString& rsLbl, + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + const wxValidator& rValidator, + const wxString& rsName) { + wxString rsLabel(rsLbl); + if (rsLabel.empty() && wxIsStockID(vId)) + rsLabel = wxGetStockLabel(vId); + + wxString sLabel = ::wxPMTextToLabel(rsLabel); + SetName(rsName); #if wxUSE_VALIDATORS SetValidator(rValidator); @@ -74,7 +78,7 @@ bool wxButton::Create( m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent) // Parent handle ,WC_BUTTON // A Button class window - ,(PSZ)rsLabel.c_str() // Button text + ,(PSZ)sLabel.c_str() // Button text ,lStyle // Button style ,0, 0, 0, 0 // Location and size ,GetHwndOf(pParent) // Owner handle @@ -106,7 +110,7 @@ bool wxButton::Create( ,rSize.y ); delete pButtonFont; - return TRUE; + return true; } // end of wxButton::Create wxButton::~wxButton() @@ -135,6 +139,7 @@ wxSize wxButton::DoGetBestSize() const int nWidthButton; int nWidthChar; int nHeightChar; + wxFont vFont = (wxFont)GetFont(); GetTextExtent( rsLabel ,&nWidthButton @@ -144,7 +149,7 @@ wxSize wxButton::DoGetBestSize() const wxGetCharSize( GetHWND() ,&nWidthChar ,&nHeightChar - ,(wxFont*)&GetFont() + ,&vFont ); // @@ -160,7 +165,7 @@ wxSize wxButton::DoGetBestSize() const // // Need a little extra to make it look right // - nHeightButton += nHeightChar/1.5; + nHeightButton += (int)(nHeightChar/1.5); if (!HasFlag(wxBU_EXACTFIT)) { @@ -231,12 +236,12 @@ void wxButton::SetDefault() wxCHECK_RET( pParent, _T("button without parent?") ); // - // Set this one as the default button both for wxWindows and Windows + // Set this one as the default button both for wxWidgets and Windows // wxWindow* pWinOldDefault = pParent->SetDefaultItem(this); - UpdateDefaultStyle( this - ,pWinOldDefault - ); + + SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false); + SetDefaultStyle( this, true ); } // end of wxButton::SetDefault void wxButton::SetTmpDefault() @@ -246,14 +251,10 @@ void wxButton::SetTmpDefault() wxCHECK_RET( pParent, _T("button without parent?") ); wxWindow* pWinOldDefault = pParent->GetDefaultItem(); + pParent->SetTmpDefaultItem(this); - if (pWinOldDefault != this) - { - UpdateDefaultStyle( this - ,pWinOldDefault - ); - } - //else: no styles to update + SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false); + SetDefaultStyle( this, true ); } // end of wxButton::SetTmpDefault void wxButton::UnsetTmpDefault() @@ -266,47 +267,56 @@ void wxButton::UnsetTmpDefault() wxWindow* pWinOldDefault = pParent->GetDefaultItem(); - if (pWinOldDefault != this) - { - UpdateDefaultStyle( pWinOldDefault - ,this - ); - } - //else: we had been default before anyhow + SetDefaultStyle( this, false ); + SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), true ); } // end of wxButton::UnsetTmpDefault -void wxButton::UpdateDefaultStyle( - wxWindow* pWinDefault -, wxWindow* pWinOldDefault) +void wxButton::SetDefaultStyle( + wxButton* pBtn +, bool bOn +) { - wxButton* pBtnOldDefault = wxDynamicCast(pWinOldDefault, wxButton); long lStyle; + // + // We may be called with NULL pointer -- simpler to do the check here than + // in the caller which does wxDynamicCast() + // + if (!pBtn) + return; - if ( pBtnOldDefault && pBtnOldDefault != pWinDefault ) + // + // First, let DefDlgProc() know about the new default button + // + if (bOn) + { + if (!wxTheApp->IsActive()) + return; + + // + // In OS/2 the dialog/panel doesn't really know it has a default + // button, the default button simply has that style. We'll just + // simulate by setting focus to it + // + pBtn->SetFocus(); + } + lStyle = ::WinQueryWindowULong(GetHwndOf(pBtn), QWL_STYLE); + if (!(lStyle & BS_DEFAULT) == bOn) { - lStyle = ::WinQueryWindowULong(GetHwndOf(pBtnOldDefault), QWL_STYLE); if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON) { - lStyle &= ~BS_DEFAULT; - ::WinSetWindowULong(GetHwndOf(pBtnOldDefault), QWL_STYLE, lStyle); + if (bOn) + lStyle |= BS_DEFAULT; + else + lStyle &= ~BS_DEFAULT; + ::WinSetWindowULong(GetHwndOf(pBtn), QWL_STYLE, lStyle); } else { - // redraw the button - it will notice itself that it's not the + // + // Redraw the button - it will notice itself that it's not the // default one any longer - pBtnOldDefault->Refresh(); - } - } - - wxButton* pBtnDefault = wxDynamicCast(pWinDefault, wxButton); - - if (pBtnDefault) - { - lStyle = ::WinQueryWindowULong(GetHwndOf(pBtnDefault), QWL_STYLE); - if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON) - { - lStyle != BS_DEFAULT; - ::WinSetWindowULong(GetHwndOf(pBtnDefault), QWL_STYLE, lStyle); + // + pBtn->Refresh(); } } } // end of wxButton::UpdateDefaultStyle @@ -315,12 +325,9 @@ void wxButton::UpdateDefaultStyle( // event/message handlers // ---------------------------------------------------------------------------- -bool wxButton::OS2Command( - WXUINT uParam -, WXWORD wId -) +bool wxButton::OS2Command(WXUINT uParam, WXWORD WXUNUSED(wId)) { - bool bProcessed = FALSE; + bool bProcessed = false; switch (uParam) { @@ -329,21 +336,20 @@ bool wxButton::OS2Command( bProcessed = SendClickEvent(); break; } + return bProcessed; } // end of wxButton::OS2Command -WXHBRUSH wxButton::OnCtlColor( - WXHDC pDC -, WXHWND pWnd -, WXUINT nCtlColor -, WXUINT uMessage -, WXWPARAM wParam -, WXLPARAM lParam -) +WXHBRUSH wxButton::OnCtlColor( WXHDC WXUNUSED(pDC), + WXHWND WXUNUSED(pWnd), + WXUINT WXUNUSED(nCtlColor), + WXUINT WXUNUSED(uMessage), + WXWPARAM WXUNUSED(wParam), + WXLPARAM WXUNUSED(lParam) ) { - wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour() - ,wxSOLID - ); + wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour() + ,wxSOLID + ); return (WXHBRUSH)pBackgroundBrush->GetResourceHandle(); } // end of wxButton::OnCtlColor @@ -384,11 +390,9 @@ WXDWORD wxButton::OS2GetStyle( return dwStyle; } // end of wxButton::OS2GetStyle -MRESULT wxButton::WindowProc( - WXUINT uMsg -, WXWPARAM wParam -, WXLPARAM lParam -) +MRESULT wxButton::WindowProc( WXUINT uMsg, + WXWPARAM wParam, + WXLPARAM lParam ) { // // When we receive focus, we want to temporary become the default button in @@ -431,4 +435,3 @@ MRESULT wxButton::WindowProc( ,lParam )); } // end of wxWindowProc -