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

Trying fight aganist CVS clashes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-03-24 17:45:40 +00:00
parent 356cbde599
commit dc25e1d304
10 changed files with 104 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gtk/dialog.cpp
View File

@@ -231,7 +231,6 @@ void wxDialog::Init()
m_returnCode = 0; m_returnCode = 0;
m_sizeSet = FALSE; m_sizeSet = FALSE;
m_modalShowing = FALSE; m_modalShowing = FALSE;
m_isFrame = TRUE;
} }
wxDialog::wxDialog( wxWindow *parent, wxDialog::wxDialog( wxWindow *parent,

2
src/gtk/frame.cpp
View File

@@ -394,7 +394,6 @@ void wxFrame::Init()
m_menuBarDetached = FALSE; m_menuBarDetached = FALSE;
m_toolBarDetached = FALSE; m_toolBarDetached = FALSE;
m_insertInClientArea = TRUE; m_insertInClientArea = TRUE;
m_isFrame = FALSE;
} }
bool wxFrame::Create( wxWindow *parent, bool wxFrame::Create( wxWindow *parent,
@@ -408,7 +407,6 @@ bool wxFrame::Create( wxWindow *parent,
wxTopLevelWindows.Append( this ); wxTopLevelWindows.Append( this );
m_needParent = FALSE; m_needParent = FALSE;
m_isFrame = TRUE;
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))

96
src/gtk/mdi.cpp
View File

@@ -47,13 +47,13 @@ extern wxList wxPendingDelete;
// "switch_page" // "switch_page"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void static void
gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
GtkNotebookPage *page, GtkNotebookPage *page,
gint WXUNUSED(page_num), gint WXUNUSED(page_num),
wxMDIParentFrame *parent ) wxMDIParentFrame *parent )
{ {
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
// send deactivate event to old child // send deactivate event to old child
@@ -65,9 +65,9 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
event1.SetEventObject( child); event1.SetEventObject( child);
child->GetEventHandler()->ProcessEvent( event1 ); child->GetEventHandler()->ProcessEvent( event1 );
} }
// send activate event to new child // send activate event to new child
wxMDIClientWindow *client_window = parent->GetClientWindow(); wxMDIClientWindow *client_window = parent->GetClientWindow();
if (!client_window) if (!client_window)
return; return;
@@ -79,16 +79,16 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
{ {
wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
if (child_frame->m_page == page) if (child_frame->m_page == page)
{ {
child = child_frame; child = child_frame;
break; break;
} }
node = node->Next(); node = node->Next();
} }
if (!child) if (!child)
return; return;
wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() ); wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
event2.SetEventObject( child); event2.SetEventObject( child);
child->GetEventHandler()->ProcessEvent( event2 ); child->GetEventHandler()->ProcessEvent( event2 );
@@ -150,8 +150,8 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
menu_bar->m_y = 0; menu_bar->m_y = 0;
menu_bar->m_width = m_width; menu_bar->m_width = m_width;
menu_bar->m_height = wxMENU_HEIGHT; menu_bar->m_height = wxMENU_HEIGHT;
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
menu_bar->m_widget, menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT ); 0, 0, m_width, wxMENU_HEIGHT );
} }
@@ -180,29 +180,29 @@ void wxMDIParentFrame::OnInternalIdle()
while (node) while (node)
{ {
wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
wxMenuBar *menu_bar = child_frame->m_menuBar; wxMenuBar *menu_bar = child_frame->m_menuBar;
if (child_frame->m_menuBar) if (child_frame->m_menuBar)
{ {
if (child_frame == active_child_frame) if (child_frame == active_child_frame)
{ {
if (menu_bar->Show(TRUE)) if (menu_bar->Show(TRUE))
{ {
menu_bar->m_width = m_width; menu_bar->m_width = m_width;
menu_bar->m_height = wxMENU_HEIGHT; menu_bar->m_height = wxMENU_HEIGHT;
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
menu_bar->m_widget, menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT ); 0, 0, m_width, wxMENU_HEIGHT );
menu_bar->SetInvokingWindow( child_frame ); menu_bar->SetInvokingWindow( child_frame );
} }
visible_child_menu = TRUE; visible_child_menu = TRUE;
} }
else else
{ {
if (menu_bar->Show(FALSE)) if (menu_bar->Show(FALSE))
{ {
menu_bar->UnsetInvokingWindow( child_frame ); menu_bar->UnsetInvokingWindow( child_frame );
} }
} }
} }
node = node->Next(); node = node->Next();
} }
@@ -212,21 +212,21 @@ void wxMDIParentFrame::OnInternalIdle()
(m_frameMenuBar->IsShown() == visible_child_menu)) (m_frameMenuBar->IsShown() == visible_child_menu))
{ {
if (visible_child_menu) if (visible_child_menu)
{ {
m_frameMenuBar->Show( FALSE ); m_frameMenuBar->Show( FALSE );
m_frameMenuBar->UnsetInvokingWindow( this ); m_frameMenuBar->UnsetInvokingWindow( this );
} }
else else
{ {
m_frameMenuBar->Show( TRUE ); m_frameMenuBar->Show( TRUE );
m_frameMenuBar->SetInvokingWindow( this ); m_frameMenuBar->SetInvokingWindow( this );
m_frameMenuBar->m_width = m_width; m_frameMenuBar->m_width = m_width;
m_frameMenuBar->m_height = wxMENU_HEIGHT; m_frameMenuBar->m_height = wxMENU_HEIGHT;
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
m_frameMenuBar->m_widget, m_frameMenuBar->m_widget,
0, 0, m_width, wxMENU_HEIGHT ); 0, 0, m_width, wxMENU_HEIGHT );
} }
} }
} }
@@ -309,6 +309,7 @@ wxMDIChildFrame::wxMDIChildFrame()
{ {
m_menuBar = (wxMenuBar *) NULL; m_menuBar = (wxMenuBar *) NULL;
m_page = (GtkNotebookPage *) NULL; m_page = (GtkNotebookPage *) NULL;
m_isFrame = TRUE;
} }
wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent, wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
@@ -318,6 +319,7 @@ wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
{ {
m_menuBar = (wxMenuBar *) NULL; m_menuBar = (wxMenuBar *) NULL;
m_page = (GtkNotebookPage *) NULL; m_page = (GtkNotebookPage *) NULL;
m_isFrame = TRUE;
Create( parent, id, title, wxDefaultPosition, size, style, name ); Create( parent, id, title, wxDefaultPosition, size, style, name );
} }
@@ -360,8 +362,8 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
m_menuBar->SetParent( mdi_frame ); m_menuBar->SetParent( mdi_frame );
/* insert the invisible menu bar into the _parent_ mdi frame */ /* insert the invisible menu bar into the _parent_ mdi frame */
gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget), gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget),
m_menuBar->m_widget, m_menuBar->m_widget,
0, 0, mdi_frame->m_width, wxMENU_HEIGHT ); 0, 0, mdi_frame->m_width, wxMENU_HEIGHT );
} }
} }
@@ -380,7 +382,7 @@ void wxMDIChildFrame::Activate()
gtk_notebook_set_page( notebook, pageno ); gtk_notebook_set_page( notebook, pageno );
#else #else
// the only way I can see to do this under gtk+ 1.0.X would // the only way I can see to do this under gtk+ 1.0.X would
// be to keep track of page numbers, start at first and // be to keep track of page numbers, start at first and
// do "next" enough times to get to this page number - messy // do "next" enough times to get to this page number - messy
// - J. Russell Smyth // - J. Russell Smyth
#endif #endif
@@ -464,7 +466,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") )) !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
{ {
wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") ); wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
return FALSE; return FALSE;
} }
m_widget = gtk_notebook_new(); m_widget = gtk_notebook_new();
@@ -483,4 +485,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
return TRUE; return TRUE;
} }
#endif // wxUSE_MDI_ARCHITECTURE #endif

2
src/gtk/spinctrl.cpp
View File

@@ -222,7 +222,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
if (event.KeyCode() == WXK_RETURN) if (event.KeyCode() == WXK_RETURN)
{ {
wxWindow *top_frame = m_parent; wxWindow *top_frame = m_parent;
while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel()))
top_frame = top_frame->GetParent(); top_frame = top_frame->GetParent();
GtkWindow *window = GTK_WINDOW(top_frame->m_widget); GtkWindow *window = GTK_WINDOW(top_frame->m_widget);

4
src/gtk/window.cpp
View File

@@ -839,7 +839,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
ret = ancestor->GetEventHandler()->ProcessEvent( command_event ); ret = ancestor->GetEventHandler()->ProcessEvent( command_event );
break; break;
} }
if (ancestor->m_isFrame) if (ancestor->IsTopLevel())
break; break;
ancestor = ancestor->GetParent(); ancestor = ancestor->GetParent();
} }
@@ -2578,7 +2578,7 @@ void wxWindow::OnInternalIdle()
now do our full redraw and switch on expose event handling again. */ now do our full redraw and switch on expose event handling again. */
bool child_already_resized = FALSE; bool child_already_resized = FALSE;
if (m_isFrame) if (IsTopLevel() && !m_isFrame)
child_already_resized = gtk_pizza_child_resized( GTK_PIZZA(m_wxwindow->parent), m_wxwindow ); child_already_resized = gtk_pizza_child_resized( GTK_PIZZA(m_wxwindow->parent), m_wxwindow );
else else
child_already_resized = gtk_pizza_child_resized( GTK_PIZZA(m_widget->parent), m_widget ); child_already_resized = gtk_pizza_child_resized( GTK_PIZZA(m_widget->parent), m_widget );

1
src/gtk1/dialog.cpp
View File

@@ -231,7 +231,6 @@ void wxDialog::Init()
m_returnCode = 0; m_returnCode = 0;
m_sizeSet = FALSE; m_sizeSet = FALSE;
m_modalShowing = FALSE; m_modalShowing = FALSE;
m_isFrame = TRUE;
} }
wxDialog::wxDialog( wxWindow *parent, wxDialog::wxDialog( wxWindow *parent,

2
src/gtk1/frame.cpp
View File

@@ -394,7 +394,6 @@ void wxFrame::Init()
m_menuBarDetached = FALSE; m_menuBarDetached = FALSE;
m_toolBarDetached = FALSE; m_toolBarDetached = FALSE;
m_insertInClientArea = TRUE; m_insertInClientArea = TRUE;
m_isFrame = FALSE;
} }
bool wxFrame::Create( wxWindow *parent, bool wxFrame::Create( wxWindow *parent,
@@ -408,7 +407,6 @@ bool wxFrame::Create( wxWindow *parent,
wxTopLevelWindows.Append( this ); wxTopLevelWindows.Append( this );
m_needParent = FALSE; m_needParent = FALSE;
m_isFrame = TRUE;
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))

96
src/gtk1/mdi.cpp
View File

@@ -47,13 +47,13 @@ extern wxList wxPendingDelete;
// "switch_page" // "switch_page"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void static void
gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
GtkNotebookPage *page, GtkNotebookPage *page,
gint WXUNUSED(page_num), gint WXUNUSED(page_num),
wxMDIParentFrame *parent ) wxMDIParentFrame *parent )
{ {
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
// send deactivate event to old child // send deactivate event to old child
@@ -65,9 +65,9 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
event1.SetEventObject( child); event1.SetEventObject( child);
child->GetEventHandler()->ProcessEvent( event1 ); child->GetEventHandler()->ProcessEvent( event1 );
} }
// send activate event to new child // send activate event to new child
wxMDIClientWindow *client_window = parent->GetClientWindow(); wxMDIClientWindow *client_window = parent->GetClientWindow();
if (!client_window) if (!client_window)
return; return;
@@ -79,16 +79,16 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
{ {
wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
if (child_frame->m_page == page) if (child_frame->m_page == page)
{ {
child = child_frame; child = child_frame;
break; break;
} }
node = node->Next(); node = node->Next();
} }
if (!child) if (!child)
return; return;
wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() ); wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
event2.SetEventObject( child); event2.SetEventObject( child);
child->GetEventHandler()->ProcessEvent( event2 ); child->GetEventHandler()->ProcessEvent( event2 );
@@ -150,8 +150,8 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
menu_bar->m_y = 0; menu_bar->m_y = 0;
menu_bar->m_width = m_width; menu_bar->m_width = m_width;
menu_bar->m_height = wxMENU_HEIGHT; menu_bar->m_height = wxMENU_HEIGHT;
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
menu_bar->m_widget, menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT ); 0, 0, m_width, wxMENU_HEIGHT );
} }
@@ -180,29 +180,29 @@ void wxMDIParentFrame::OnInternalIdle()
while (node) while (node)
{ {
wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
wxMenuBar *menu_bar = child_frame->m_menuBar; wxMenuBar *menu_bar = child_frame->m_menuBar;
if (child_frame->m_menuBar) if (child_frame->m_menuBar)
{ {
if (child_frame == active_child_frame) if (child_frame == active_child_frame)
{ {
if (menu_bar->Show(TRUE)) if (menu_bar->Show(TRUE))
{ {
menu_bar->m_width = m_width; menu_bar->m_width = m_width;
menu_bar->m_height = wxMENU_HEIGHT; menu_bar->m_height = wxMENU_HEIGHT;
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
menu_bar->m_widget, menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT ); 0, 0, m_width, wxMENU_HEIGHT );
menu_bar->SetInvokingWindow( child_frame ); menu_bar->SetInvokingWindow( child_frame );
} }
visible_child_menu = TRUE; visible_child_menu = TRUE;
} }
else else
{ {
if (menu_bar->Show(FALSE)) if (menu_bar->Show(FALSE))
{ {
menu_bar->UnsetInvokingWindow( child_frame ); menu_bar->UnsetInvokingWindow( child_frame );
} }
} }
} }
node = node->Next(); node = node->Next();
} }
@@ -212,21 +212,21 @@ void wxMDIParentFrame::OnInternalIdle()
(m_frameMenuBar->IsShown() == visible_child_menu)) (m_frameMenuBar->IsShown() == visible_child_menu))
{ {
if (visible_child_menu) if (visible_child_menu)
{ {
m_frameMenuBar->Show( FALSE ); m_frameMenuBar->Show( FALSE );
m_frameMenuBar->UnsetInvokingWindow( this ); m_frameMenuBar->UnsetInvokingWindow( this );
} }
else else
{ {
m_frameMenuBar->Show( TRUE ); m_frameMenuBar->Show( TRUE );
m_frameMenuBar->SetInvokingWindow( this ); m_frameMenuBar->SetInvokingWindow( this );
m_frameMenuBar->m_width = m_width; m_frameMenuBar->m_width = m_width;
m_frameMenuBar->m_height = wxMENU_HEIGHT; m_frameMenuBar->m_height = wxMENU_HEIGHT;
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
m_frameMenuBar->m_widget, m_frameMenuBar->m_widget,
0, 0, m_width, wxMENU_HEIGHT ); 0, 0, m_width, wxMENU_HEIGHT );
} }
} }
} }
@@ -309,6 +309,7 @@ wxMDIChildFrame::wxMDIChildFrame()
{ {
m_menuBar = (wxMenuBar *) NULL; m_menuBar = (wxMenuBar *) NULL;
m_page = (GtkNotebookPage *) NULL; m_page = (GtkNotebookPage *) NULL;
m_isFrame = TRUE;
} }
wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent, wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
@@ -318,6 +319,7 @@ wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
{ {
m_menuBar = (wxMenuBar *) NULL; m_menuBar = (wxMenuBar *) NULL;
m_page = (GtkNotebookPage *) NULL; m_page = (GtkNotebookPage *) NULL;
m_isFrame = TRUE;
Create( parent, id, title, wxDefaultPosition, size, style, name ); Create( parent, id, title, wxDefaultPosition, size, style, name );
} }
@@ -360,8 +362,8 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
m_menuBar->SetParent( mdi_frame ); m_menuBar->SetParent( mdi_frame );
/* insert the invisible menu bar into the _parent_ mdi frame */ /* insert the invisible menu bar into the _parent_ mdi frame */
gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget), gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget),
m_menuBar->m_widget, m_menuBar->m_widget,
0, 0, mdi_frame->m_width, wxMENU_HEIGHT ); 0, 0, mdi_frame->m_width, wxMENU_HEIGHT );
} }
} }
@@ -380,7 +382,7 @@ void wxMDIChildFrame::Activate()
gtk_notebook_set_page( notebook, pageno ); gtk_notebook_set_page( notebook, pageno );
#else #else
// the only way I can see to do this under gtk+ 1.0.X would // the only way I can see to do this under gtk+ 1.0.X would
// be to keep track of page numbers, start at first and // be to keep track of page numbers, start at first and
// do "next" enough times to get to this page number - messy // do "next" enough times to get to this page number - messy
// - J. Russell Smyth // - J. Russell Smyth
#endif #endif
@@ -464,7 +466,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") )) !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
{ {
wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") ); wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
return FALSE; return FALSE;
} }
m_widget = gtk_notebook_new(); m_widget = gtk_notebook_new();
@@ -483,4 +485,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
return TRUE; return TRUE;
} }
#endif // wxUSE_MDI_ARCHITECTURE #endif

2
src/gtk1/spinctrl.cpp
View File

@@ -222,7 +222,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
if (event.KeyCode() == WXK_RETURN) if (event.KeyCode() == WXK_RETURN)
{ {
wxWindow *top_frame = m_parent; wxWindow *top_frame = m_parent;
while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel()))
top_frame = top_frame->GetParent(); top_frame = top_frame->GetParent();
GtkWindow *window = GTK_WINDOW(top_frame->m_widget); GtkWindow *window = GTK_WINDOW(top_frame->m_widget);

4
src/gtk1/window.cpp
View File

@@ -839,7 +839,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
ret = ancestor->GetEventHandler()->ProcessEvent( command_event ); ret = ancestor->GetEventHandler()->ProcessEvent( command_event );
break; break;
} }
if (ancestor->m_isFrame) if (ancestor->IsTopLevel())
break; break;
ancestor = ancestor->GetParent(); ancestor = ancestor->GetParent();
} }
@@ -2578,7 +2578,7 @@ void wxWindow::OnInternalIdle()
now do our full redraw and switch on expose event handling again. */ now do our full redraw and switch on expose event handling again. */
bool child_already_resized = FALSE; bool child_already_resized = FALSE;
if (m_isFrame) if (IsTopLevel() && !m_isFrame)
child_already_resized = gtk_pizza_child_resized( GTK_PIZZA(m_wxwindow->parent), m_wxwindow ); child_already_resized = gtk_pizza_child_resized( GTK_PIZZA(m_wxwindow->parent), m_wxwindow );
else else
child_already_resized = gtk_pizza_child_resized( GTK_PIZZA(m_widget->parent), m_widget ); child_already_resized = gtk_pizza_child_resized( GTK_PIZZA(m_widget->parent), m_widget );