X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40d432c482326ccbc609b212415f3c62ddd4e70d..e1910715af0629ad65976e87cdeca23ede2fd6ee:/src/gtk/mdi.cpp

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 34c130d9d5..fc8b911281 100644
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -297,7 +297,7 @@ wxMDIChildFrame::wxMDIChildFrame()
 {
     m_menuBar = (wxMenuBar *) NULL;
     m_page = (GtkNotebookPage *) NULL;
-    m_isFrame = TRUE;
+    m_isFrame = FALSE;
 }
 
 wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
@@ -307,7 +307,7 @@ wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
 {
     m_menuBar = (wxMenuBar *) NULL;
     m_page = (GtkNotebookPage *) NULL;
-    m_isFrame = TRUE;
+    m_isFrame = FALSE;
     Create( parent, id, title, wxDefaultPosition, size, style, name );
 }
 
@@ -363,12 +363,12 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
 
 void wxMDIChildFrame::Activate()
 {
-#if (GTK_MINOR_VERSION > 0)
+#if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0)
     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
-    gint pageno = gtk_notebook_page_num( notebook, m_page->child );
+    gint pageno = gtk_notebook_page_num( notebook, m_widget );
     gtk_notebook_set_page( notebook, pageno );
-#else
+#else // GTK+ 1.0
     // 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
     // do "next" enough times to get to this page number - messy
@@ -402,7 +402,7 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 
     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
-    gtk_notebook_set_tab_label_text(notebook, m_page->child, title.mbc_str());
+    gtk_notebook_set_tab_label_text(notebook, m_widget, title.mbc_str());
 }
 
 //-----------------------------------------------------------------------------