X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9eee2db810695ae4417e9935475f268bb68bbac..f7ff39c6ac67b995c13900af1b6a4b32e8c7f9f2:/src/os2/button.cpp diff --git a/src/os2/button.cpp b/src/os2/button.cpp index 397ee99eda..5c4e70d5a0 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -51,6 +51,9 @@ bool wxButton::Create( , const wxString& rsName ) { + + wxString sLabel = ::wxPMTextToLabel(rsLabel); + SetName(rsName); #if wxUSE_VALIDATORS SetValidator(rValidator); @@ -73,7 +76,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 @@ -159,7 +162,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)) { @@ -230,7 +233,7 @@ 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); @@ -311,7 +314,7 @@ void wxButton::SetDefaultStyle( if ((lStyle & BS_USERBUTTON) != BS_USERBUTTON) { if (bOn) - lStyle | BS_DEFAULT; + lStyle |= BS_DEFAULT; else lStyle &= ~BS_DEFAULT; ::WinSetWindowULong(GetHwndOf(pBtn), QWL_STYLE, lStyle);