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 ))

4
src/gtk/mdi.cpp
View File

@@ -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 );
} }
@@ -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 ))

4
src/gtk1/mdi.cpp
View File

@@ -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 );
} }
@@ -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 );