X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fbb8fbbed4e8a15bed1cd539d0f51eac3019658..4f33a4dd4c6e92ec613aa73737030e992f5d8c65:/src/os2/control.cpp diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 51eff786ee..63650453c8 100644 --- a/src/os2/control.cpp +++ b/src/os2/control.cpp @@ -135,8 +135,8 @@ bool wxControl::OS2CreateControl( const wxChar* zClassname, dwStyle &= ~WS_CLIPSIBLINGS; m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle - ,(PSZ)zClass // Window class - ,(PSZ)label.c_str() // Initial Text + ,zClass // Window class + ,label.c_str() // Initial Text ,(ULONG)dwStyle // Style flags ,(LONG)0 // X pos of origin ,(LONG)0 // Y pos of origin @@ -227,7 +227,7 @@ WXDWORD wxControl::OS2GetStyle( long lStyle, WXDWORD* pdwExstyle ) const { long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle ); - if (AcceptsFocus()) + if (AcceptsFocusFromKeyboard()) { dwStyle |= WS_TABSTOP; } @@ -244,7 +244,7 @@ void wxControl::SetLabel( const wxString& rsLabel ) label = ::wxPMTextToLabel(m_label); else label = m_label; - ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str()); + ::WinSetWindowText(GetHwnd(), label.c_str()); } } // end of wxControl::SetLabel