compile fix

[wxWidgets.git] / src / os2 / control.cpp

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 51eff786ee8367ce25756322c243caef4fbba3bb..63650453c83fcb8ac3223a65a0bbb786199b900a 100644 (file)
--- 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
     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
                                        ,(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 );
 
 {
     long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle );
 

-    if (AcceptsFocus())
+    if (AcceptsFocusFromKeyboard())

     {
         dwStyle |= WS_TABSTOP;
     }
     {
         dwStyle |= WS_TABSTOP;
     }


@@ -244,7 +244,7 @@ void wxControl::SetLabel( const wxString& rsLabel )
             label = ::wxPMTextToLabel(m_label);
         else
             label = m_label;
             label = ::wxPMTextToLabel(m_label);
         else
             label = m_label;

-        ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str());
+        ::WinSetWindowText(GetHwnd(), label.c_str());

     }
 } // end of wxControl::SetLabel
 
     }
 } // end of wxControl::SetLabel