cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-11-16 23:09:32 +00:00
parent 7c0ea335c7
commit 3175c712e9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/framecmn.cpp
View File

@ -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") ); wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
m_frameStatusBar->SetStatusText(text, number); 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") ); wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") );
m_frameStatusBar->SetStatusWidths(n, widths_field); m_frameStatusBar->SetStatusWidths(n, widths_field);

3
src/msw/statbr95.cpp
View File

@ -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 *pWidths = new int[m_nFields];
int nWindowWidth, y; int nWindowWidth, y;