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

crash for frames without children corrected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-03-12 15:21:14 +00:00
parent 5f12ae5cd7
commit 0138c2de79
2 changed files with 60 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/gtk/frame.cpp
View File

@@ -297,10 +297,10 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
if ((m_x != -1) || (m_y != -1)) if ((m_x != -1) || (m_y != -1))
{ {
if ((m_x != old_x) || (m_y != old_y)) if ((m_x != old_x) || (m_y != old_y))
{ {
/* m_sizeSet = FALSE; */ /* m_sizeSet = FALSE; */
gtk_widget_set_uposition( m_widget, m_x, m_y ); gtk_widget_set_uposition( m_widget, m_x, m_y );
} }
} }
if ((m_width != old_width) || (m_height != old_height)) if ((m_width != old_width) || (m_height != old_height))
@@ -483,32 +483,31 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
} }
else else
{ {
/* no child: go out ! */ // do we have exactly one child?
if (!GetChildren().First()) return; wxWindow *child = (wxWindow *)NULL;
for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
/* do we have exactly one child? */
wxWindow *child = (wxWindow *) NULL;
for(wxNode *node = GetChildren().First(); node; node = node->Next())
{ {
wxWindow *win = (wxWindow *)node->Data(); wxWindow *win = (wxWindow *)node->Data();
if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) if ( !wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) )
#if 0 // not in m_children anyway ?
&& (win != m_frameMenuBar) &&
(win != m_frameToolBar) &&
(win != m_frameStatusBar)
#endif
)
{ {
/* it's the second one: do nothing */ if ( child )
if (child) return; {
// it's the second one: do nothing
return;
}
child = win; child = win;
} }
} }
/* yes: set it's size to fill all the frame */ // no children at all?
int client_x, client_y; if ( child )
GetClientSize( &client_x, &client_y ); {
child->SetSize( 1, 1, client_x-2, client_y-2 ); // yes: set it's size to fill all the frame
int client_x, client_y;
GetClientSize( &client_x, &client_y );
child->SetSize( 1, 1, client_x-2, client_y-2 );
}
} }
} }
@@ -548,8 +547,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
/* an mdi child menu bar might be underneath */ /* an mdi child menu bar might be underneath */
if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE ); if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE );
} }
} }
@@ -565,22 +564,20 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
{ {
if (GetStatusBar()) if (GetStatusBar())
{ {
if (event.GetMenuId() == -1) // if no help string found, we will clear the status bar text
{ wxString helpString;
SetStatusText("");
} int menuId = event.GetMenuId();
else if ( menuId != -1 )
{ {
wxMenuBar *menuBar = GetMenuBar(); wxMenuBar *menuBar = GetMenuBar();
if (menuBar) if (menuBar)
{ {
int menuId = event.GetMenuId();
wxString helpString;
helpString = menuBar->GetHelpString(menuId); helpString = menuBar->GetHelpString(menuId);
if (helpString != "")
SetStatusText(helpString);
} }
} }
SetStatusText(helpString);
} }
} }

63
src/gtk1/frame.cpp
View File

@@ -297,10 +297,10 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
if ((m_x != -1) || (m_y != -1)) if ((m_x != -1) || (m_y != -1))
{ {
if ((m_x != old_x) || (m_y != old_y)) if ((m_x != old_x) || (m_y != old_y))
{ {
/* m_sizeSet = FALSE; */ /* m_sizeSet = FALSE; */
gtk_widget_set_uposition( m_widget, m_x, m_y ); gtk_widget_set_uposition( m_widget, m_x, m_y );
} }
} }
if ((m_width != old_width) || (m_height != old_height)) if ((m_width != old_width) || (m_height != old_height))
@@ -483,32 +483,31 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
} }
else else
{ {
/* no child: go out ! */ // do we have exactly one child?
if (!GetChildren().First()) return; wxWindow *child = (wxWindow *)NULL;
for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
/* do we have exactly one child? */
wxWindow *child = (wxWindow *) NULL;
for(wxNode *node = GetChildren().First(); node; node = node->Next())
{ {
wxWindow *win = (wxWindow *)node->Data(); wxWindow *win = (wxWindow *)node->Data();
if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) if ( !wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) )
#if 0 // not in m_children anyway ?
&& (win != m_frameMenuBar) &&
(win != m_frameToolBar) &&
(win != m_frameStatusBar)
#endif
)
{ {
/* it's the second one: do nothing */ if ( child )
if (child) return; {
// it's the second one: do nothing
return;
}
child = win; child = win;
} }
} }
/* yes: set it's size to fill all the frame */ // no children at all?
int client_x, client_y; if ( child )
GetClientSize( &client_x, &client_y ); {
child->SetSize( 1, 1, client_x-2, client_y-2 ); // yes: set it's size to fill all the frame
int client_x, client_y;
GetClientSize( &client_x, &client_y );
child->SetSize( 1, 1, client_x-2, client_y-2 );
}
} }
} }
@@ -548,8 +547,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
/* an mdi child menu bar might be underneath */ /* an mdi child menu bar might be underneath */
if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE ); if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE );
} }
} }
@@ -565,22 +564,20 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
{ {
if (GetStatusBar()) if (GetStatusBar())
{ {
if (event.GetMenuId() == -1) // if no help string found, we will clear the status bar text
{ wxString helpString;
SetStatusText("");
} int menuId = event.GetMenuId();
else if ( menuId != -1 )
{ {
wxMenuBar *menuBar = GetMenuBar(); wxMenuBar *menuBar = GetMenuBar();
if (menuBar) if (menuBar)
{ {
int menuId = event.GetMenuId();
wxString helpString;
helpString = menuBar->GetHelpString(menuId); helpString = menuBar->GetHelpString(menuId);
if (helpString != "")
SetStatusText(helpString);
} }
} }
SetStatusText(helpString);
} }
} }