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

45
src/gtk/frame.cpp
View File

@@ -483,34 +483,33 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
}
else
{
/* no child: go out ! */
if (!GetChildren().First()) return;
/* do we have exactly one child? */
// do we have exactly one child?
wxWindow *child = (wxWindow *)NULL;
for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
{
wxWindow *win = (wxWindow *)node->Data();
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
)
if ( !wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) )
{
/* it's the second one: do nothing */
if (child) return;
if ( child )
{
// it's the second one: do nothing
return;
}
child = win;
}
}
/* yes: set it's size to fill all the frame */
// no children at all?
if ( child )
{
// 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 );
}
}
}
static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
{
@@ -565,24 +564,22 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
{
if (GetStatusBar())
{
if (event.GetMenuId() == -1)
{
SetStatusText("");
}
else
// if no help string found, we will clear the status bar text
wxString helpString;
int menuId = event.GetMenuId();
if ( menuId != -1 )
{
wxMenuBar *menuBar = GetMenuBar();
if (menuBar)
{
int menuId = event.GetMenuId();
wxString helpString;
helpString = menuBar->GetHelpString(menuId);
if (helpString != "")
}
}
SetStatusText(helpString);
}
}
}
}
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{

45
src/gtk1/frame.cpp
View File

@@ -483,34 +483,33 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
}
else
{
/* no child: go out ! */
if (!GetChildren().First()) return;
/* do we have exactly one child? */
// do we have exactly one child?
wxWindow *child = (wxWindow *)NULL;
for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
{
wxWindow *win = (wxWindow *)node->Data();
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
)
if ( !wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) )
{
/* it's the second one: do nothing */
if (child) return;
if ( child )
{
// it's the second one: do nothing
return;
}
child = win;
}
}
/* yes: set it's size to fill all the frame */
// no children at all?
if ( child )
{
// 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 );
}
}
}
static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
{
@@ -565,24 +564,22 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
{
if (GetStatusBar())
{
if (event.GetMenuId() == -1)
{
SetStatusText("");
}
else
// if no help string found, we will clear the status bar text
wxString helpString;
int menuId = event.GetMenuId();
if ( menuId != -1 )
{
wxMenuBar *menuBar = GetMenuBar();
if (menuBar)
{
int menuId = event.GetMenuId();
wxString helpString;
helpString = menuBar->GetHelpString(menuId);
if (helpString != "")
}
}
SetStatusText(helpString);
}
}
}
}
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{