wxMSW fixes after wxFrameBase change - seems to work ok too by now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index a1c9575cfa2f45323fe7f1fb192f27d0626de211..e07790dfd87ac880ca0b33cbeb44aa5cce056f22 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -305,8 +305,6 @@ wxStatusBar *wxFrameBase::OnCreateStatusBar(int number,
 
 void wxFrameBase::SetStatusText(const wxString& text, int number)
 {
 
 void wxFrameBase::SetStatusText(const wxString& text, int number)
 {

-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-

     wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
 
     m_frameStatusBar->SetStatusText(text, number);
     wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
 
     m_frameStatusBar->SetStatusText(text, number);


@@ -314,8 +312,6 @@ void wxFrameBase::SetStatusText(const wxString& text, int number)
 
 void wxFrameBase::SetStatusWidths(int n, const int widths_field[] )
 {
 
 void wxFrameBase::SetStatusWidths(int n, const int widths_field[] )
 {

-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-

     wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") );
 
     m_frameStatusBar->SetStatusWidths(n, widths_field);
     wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") );
 
     m_frameStatusBar->SetStatusWidths(n, widths_field);

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 5f91a3c092051fba525872a01a89b40d5b367687..87455611bf092c5a33fa9291840228ac726ded33 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -147,6 +147,9 @@ void wxStatusBar95::SetStatusWidths(int n, const int widths[])
 
 void wxStatusBar95::SetFieldsWidth()
 {
 
 void wxStatusBar95::SetFieldsWidth()
 {

+    if ( !m_nFields )
+        return;
+

   int *pWidths = new int[m_nFields];
 
   int nWindowWidth, y;
   int *pWidths = new int[m_nFields];
 
   int nWindowWidth, y;