X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfcebdb1bba3369205b6693f2593f74394354edd..affd2611c569d9d8e60fa542614f6668956b16de:/src/os2/control.cpp

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index a50497174d..df264fae88 100644
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     09/17/99
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -21,6 +21,7 @@
 #include "wx/app.h"
 #include "wx/dcclient.h"
 #include "wx/scrolwin.h"
+#include "wx/log.h"
 #endif
 #include "wx/os2/private.h"
 #include "wx/control.h"
@@ -34,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(
@@ -46,9 +43,7 @@ bool wxControl::Create(
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle
-#if wxUSE_VALIDATORS
 , const wxValidator&                rValidator
-#endif
 , const wxString&                   rsName
 )
 {
@@ -104,17 +99,16 @@ 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
+    // All controls should have these styles (wxWidgets creates all controls
     // visible by default)
     //
     if (m_isShown )
@@ -134,6 +128,8 @@ bool wxControl::OS2CreateControl(
         zClass = WC_BUTTON;
     else if ((strcmp(zClassname, "NOTEBOOK")) == 0)
         zClass = WC_NOTEBOOK;
+    else if ((strcmp(zClassname, "CONTAINER")) == 0)
+        zClass = WC_CONTAINER;
     dwStyle |= WS_VISIBLE;
 
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
@@ -165,9 +161,14 @@ bool wxControl::OS2CreateControl(
     SubclassWin(m_hWnd);
 
     //
-    // Controls use the same font and colours as their parent dialog by default
+    // Controls use the same colours as their parent dialog by default
     //
     InheritAttributes();
+    //
+    // All OS/2 ctrls use the small font
+    //
+    SetFont(*wxSMALL_FONT);
+
     SetXComp(0);
     SetYComp(0);
     SetSize( rPos.x
@@ -185,16 +186,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);
 }
 
@@ -254,6 +245,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
 // ---------------------------------------------------------------------------
@@ -284,10 +284,10 @@ void wxFindMaxSize(
     if (nRight > pRect->xRight)
         pRect->xRight = nRight;
 
-    if (nTop < pRect->yTop)
+    if (nTop > pRect->yTop)
         pRect->yTop = nTop;
 
-    if (nBottom > pRect->yBottom)
+    if (nBottom < pRect->yBottom)
         pRect->yBottom = nBottom;
 } // end of wxFindMaxSize