X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..9556c0f1b3dec367bf2bdc3eef7b1d54668adcf7:/src/os2/control.cpp

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 3e97f4a862..1dd3f453d1 100644
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -35,10 +35,6 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
-
-#if WXWIN_COMPATIBILITY
-  m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
 } // end of wxControl::wxControl
 
 bool wxControl::Create(
@@ -103,14 +99,13 @@ bool wxControl::OS2CreateControl(
 , WXDWORD                           dwExstyle
 )
 {
-    bool                            bWant3D = FALSE;
-
     //
     // Doesn't do anything at all under OS/2
     //
     if (dwExstyle == (WXDWORD)-1)
     {
-        dwExstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D);
+        dwExstyle = 0;
+	(void) OS2GetStyle(GetWindowStyle(), &dwExstyle);
     }
     //
     // All controls should have these styles (wxWindows creates all controls
@@ -186,16 +181,6 @@ wxSize wxControl::DoGetBestSize() const
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
-#if WXWIN_COMPATIBILITY
-    if ( m_callback )
-    {
-        (void)(*m_callback)(this, event);
-
-        return TRUE;
-    }
-    else
-#endif // WXWIN_COMPATIBILITY
-
     return GetEventHandler()->ProcessEvent(event);
 }
 
@@ -255,6 +240,15 @@ WXDWORD wxControl::OS2GetStyle(
     return dwStyle;
 } // end of wxControl::OS2GetStyle
 
+void wxControl::SetLabel(
+  const wxString&                   rsLabel
+)
+{
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+
+    ::WinSetWindowText(GetHwnd(), sLabel.c_str());
+} // end of wxControl::SetLabel
+
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------