added and documented wxWindow::RemoveEventHandler()

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index d6087502a303b0021eb97e7530d04b250670adaf..4b5e439c6a2d6a8617082b7aa7ca4d063d07e254 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -144,7 +144,6 @@ bool wxFrame::Create(
                                   ,rsName
                                  ))
         return FALSE;
                                   ,rsName
                                  ))
         return FALSE;

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

     wxModelessWindows.Append(this);
     return TRUE;
 } // end of wxFrame::Create
     wxModelessWindows.Append(this);
     return TRUE;
 } // end of wxFrame::Create


@@ -248,6 +247,26 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
     if( !pStatusBar )
         return NULL;
 
     if( !pStatusBar )
         return NULL;
 

+    wxClientDC                      vDC(pStatusBar);
+    int                             nY;
+
+    //
+    // Set the height according to the font and the border size
+    //
+    vDC.SetFont(pStatusBar->GetFont()); // Screws up the menues for some reason
+    vDC.GetTextExtent( "X"
+                      ,NULL
+                      ,&nY
+                     );
+
+    int                             nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY());
+
+    pStatusBar->SetSize( -1
+                        ,-1
+                        ,-1
+                        ,nHeight
+                       );
+

     ::WinSetParent( pStatusBar->GetHWND()
                    ,m_hFrame
                    ,FALSE
     ::WinSetParent( pStatusBar->GetHWND()
                    ,m_hFrame
                    ,FALSE