X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b086de1460fd46c21a432ac3d8dec2759e5d05a..8f4fcc4ee080b020057cc028a809ffc884f63bb8:/src/os2/toplevel.cpp?ds=sidebyside

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index 7596ef7dcc..238342a052 100644
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -35,6 +35,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
+    #include "wx/control.h"
 #endif //WX_PRECOMP
 
 #include "wx/os2/private.h"
@@ -276,10 +277,6 @@ bool wxTopLevelWindowOS2::CreateDialog(
                       ,nHeight
                       ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW
                      );
-    if (!rsTitle.IsNull())
-    {
-        ::WinSetWindowText(GetHwnd(), rsTitle.c_str());
-    }
     SubclassWin(m_hWnd);
     return TRUE;
 } // end of wxTopLevelWindowOS2::CreateDialog
@@ -354,7 +351,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
     wxAssociateWinWithHandle(m_hWnd, this);
     wxAssociateWinWithHandle(m_hFrame, this);
 
-    m_backgroundColour.Set(wxString("GREY"));
+    m_backgroundColour.Set(wxString("MEDIUM GREY"));
 
     LONG                            lColor = (LONG)m_backgroundColour.GetPixel();
 
@@ -406,6 +403,14 @@ bool wxTopLevelWindowOS2::CreateFrame(
         wxLogError("Error sizing frame. Error: %s\n", sError);
         return FALSE;
     }
+    lStyle =  ::WinQueryWindowULong( m_hWnd
+                                    ,QWL_STYLE
+                                   );
+    lStyle |= WS_CLIPCHILDREN;
+    ::WinSetWindowULong( m_hWnd
+                        ,QWL_STYLE
+                        ,lStyle
+                       );
     return TRUE;
 } // end of wxTopLevelWindowOS2::CreateFrame
 
@@ -587,7 +592,7 @@ void wxTopLevelWindowOS2::DoShowWindow(
   int                               nShowCmd
 )
 {
-    ::WinShowWindow(m_hFrame, (BOOL)nShowCmd);
+    ::WinShowWindow(m_hFrame, (BOOL)(nShowCmd & SWP_SHOW));
     m_bIconized = nShowCmd == SWP_MINIMIZE;
 } // end of wxTopLevelWindowOS2::DoShowWindow
 
@@ -603,12 +608,12 @@ bool wxTopLevelWindowOS2::Show(
     {
         if (m_bMaximizeOnShow)
         {
-            nShowCmd = SWP_SHOW;
+            nShowCmd = SWP_MAXIMIZE;
             m_bMaximizeOnShow = FALSE;
         }
         else
         {
-            nShowCmd = SWP_HIDE;
+            nShowCmd = SWP_SHOW;
         }
     }
     else // hide