X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2919ab326e60322b63ae9b5d50e83bb5156efce..db28c33ca268429840045ef81c17ee1459f4ec47:/src/msw/statbr95.cpp

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index ae56a7be84..37b9b03f73 100644
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -70,7 +70,7 @@ bool wxStatusBar95::Create(wxWindow *parent,
                            long style,
                            const wxString& name)
 {
-    wxCHECK_MSG( parent, FALSE, wxT("status bar must have a parent") );
+    wxCHECK_MSG( parent, false, wxT("status bar must have a parent") );
 
     SetName(name);
     SetWindowStyleFlag(style);
@@ -78,7 +78,7 @@ bool wxStatusBar95::Create(wxWindow *parent,
 
     parent->AddChild(this);
 
-    m_windowId = id == -1 ? NewControlId() : id;
+    m_windowId = id == wxID_ANY ? NewControlId() : id;
 
     DWORD wstyle = WS_CHILD | WS_VISIBLE;
 
@@ -111,7 +111,7 @@ bool wxStatusBar95::Create(wxWindow *parent,
     {
         wxLogSysError(_("Failed to create a status bar."));
 
-        return FALSE;
+        return false;
     }
 
     SetFieldsCount(1);
@@ -119,12 +119,28 @@ bool wxStatusBar95::Create(wxWindow *parent,
     InheritAttributes();
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
+    
+    // we must refresh the frame size when the statusbar is created, because
+    // its client area might change
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame )
+    {
+        frame->SendSizeEvent();
+    }
 
-    return TRUE;
+    return true;
 }
 
 wxStatusBar95::~wxStatusBar95()
 {
+    // we must refresh the frame size when the statusbar is deleted but the
+    // frame is not - otherwise statusbar leaves a hole in the place it used to
+    // occupy
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && !frame->IsBeingDeleted() )
+    {
+        frame->SendSizeEvent();
+    }
 }
 
 void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
@@ -247,7 +263,7 @@ void wxStatusBar95::SetMinHeight(int height)
 
 bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
 {
-    wxCHECK_MSG( (i >= 0) && (i < m_nFields), FALSE,
+    wxCHECK_MSG( (i >= 0) && (i < m_nFields), false,
                  _T("invalid statusbar field index") );
 
     RECT r;
@@ -258,7 +274,7 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
 
     wxCopyRECTToRect(r, rect);
 
-    return TRUE;
+    return true;
 }
 
 void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
@@ -279,7 +295,7 @@ void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
     // adjust fields widths to the new size
     SetFieldsWidth();
 
-    // we have to trigger wxSizeEvent if there are children window in status 
+    // we have to trigger wxSizeEvent if there are children window in status
     // bar because GetFieldRect returned incorrect (not updated) values up to
     // here, which almost certainly resulted in incorrectly redrawn statusbar
     if ( m_children.GetCount() > 0 )