When wxUSE_STL == 1 and STL provides quasi-standard hash_map/hash_set,

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 1dd3f453d139f04fcf6142992350144a615f7436..c9354af222b8161feb264597823c71ce9d8ffc8e 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -161,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
@@ -279,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