From a0fdaceeb177c53820baf2be167bd892d51d1a8c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 Apr 1999 11:39:51 +0000 Subject: [PATCH] GTK 1.0.x compilation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/mdi.cpp | 54 +++++++++++++++++++++++++--------------------- src/gtk/win_gtk.c | 7 ++++-- src/gtk1/mdi.cpp | 54 +++++++++++++++++++++++++--------------------- src/gtk1/win_gtk.c | 7 ++++-- 4 files changed, 68 insertions(+), 54 deletions(-) diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index 82f5e1c260..5df3bbfd17 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -25,7 +25,7 @@ // constants //----------------------------------------------------------------------------- -const int wxMENU_HEIGHT = 27; +const int wxMENU_HEIGHT = 27; //----------------------------------------------------------------------------- // globals @@ -77,14 +77,14 @@ bool wxMDIParentFrame::Create( wxWindow *parent, void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) { wxFrame::GtkOnSize( x, y, width, height ); - + wxMDIChildFrame *child_frame = GetActiveChild(); if (!child_frame) return; - + wxMenuBar *menu_bar = child_frame->m_menuBar; if (!menu_bar) return; if (!menu_bar->m_widget) return; - + menu_bar->m_x = 0; menu_bar->m_y = 0; menu_bar->m_width = m_width; @@ -103,30 +103,30 @@ void wxMDIParentFrame::OnInternalIdle() if (m_justInserted) { GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); - gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 ); - - m_justInserted = FALSE; - return; + gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 ); + + m_justInserted = FALSE; + return; } - + wxFrame::OnInternalIdle(); wxMDIChildFrame *active_child_frame = GetActiveChild(); - + wxNode *node = m_clientWindow->m_children.First(); while (node) { wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); - if (child_frame->m_menuBar) - { - if (child_frame == active_child_frame) - gtk_widget_show( child_frame->m_menuBar->m_widget ); - else - gtk_widget_hide( child_frame->m_menuBar->m_widget ); - } + if (child_frame->m_menuBar) + { + if (child_frame == active_child_frame) + gtk_widget_show( child_frame->m_menuBar->m_widget ); + else + gtk_widget_hide( child_frame->m_menuBar->m_widget ); + } node = node->Next(); } - + /* show/hide parent menu bar as required */ if (m_frameMenuBar) m_frameMenuBar->Show( (active_child_frame == NULL) ); } @@ -139,16 +139,20 @@ void wxMDIParentFrame::GetClientSize(int *width, int *height ) const wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const { if (!m_clientWindow) return (wxMDIChildFrame*) NULL; - + GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); if (!notebook) return (wxMDIChildFrame*) NULL; - + +#if (GTK_MINOR_VERSION > 0) gint i = gtk_notebook_get_current_page( notebook ); +#else + gint i = gtk_notebook_current_page( notebook ); +#endif if (i < 0) return (wxMDIChildFrame*) NULL; - + GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data); if (!page) return (wxMDIChildFrame*) NULL; - + wxNode *node = m_clientWindow->m_children.First(); while (node) { @@ -157,7 +161,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const return child_frame; node = node->Next(); } - + return (wxMDIChildFrame*) NULL; } @@ -279,7 +283,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) } /* the menu bar of the child window is shown in idle time as needed */ - gtk_widget_hide( m_menuBar->m_widget ); + gtk_widget_hide( m_menuBar->m_widget ); /* insert the invisible menu bar into the _parent_ mdi frame */ gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0, 0 ); @@ -338,7 +342,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil gtk_notebook_append_page( notebook, child->m_widget, label_widget ); child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); - + wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->m_parent; parent_frame->m_justInserted = TRUE; } diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 31b638fb6f..7e8498ea5a 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -413,9 +413,11 @@ gtk_myfixed_size_allocate (GtkWidget *widget, myfixed = GTK_MYFIXED (widget); +#if (GTK_MINOR_VERSION > 0) if (myfixed->shadow_type == GTK_SHADOW_NONE) border = 0; else +#endif border = 2; widget->allocation = *allocation; @@ -424,10 +426,11 @@ gtk_myfixed_size_allocate (GtkWidget *widget, gdk_window_move_resize( widget->window, allocation->x+border, allocation->y+border, #if (GTK_MINOR_VERSION > 0) - allocation->width-border*2, allocation->height-border*2 ); + allocation->width-border*2, allocation->height-border*2 #else - 32000, 32000 ); + 32000, 32000 #endif + ); } children = myfixed->children; diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 82f5e1c260..5df3bbfd17 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -25,7 +25,7 @@ // constants //----------------------------------------------------------------------------- -const int wxMENU_HEIGHT = 27; +const int wxMENU_HEIGHT = 27; //----------------------------------------------------------------------------- // globals @@ -77,14 +77,14 @@ bool wxMDIParentFrame::Create( wxWindow *parent, void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) { wxFrame::GtkOnSize( x, y, width, height ); - + wxMDIChildFrame *child_frame = GetActiveChild(); if (!child_frame) return; - + wxMenuBar *menu_bar = child_frame->m_menuBar; if (!menu_bar) return; if (!menu_bar->m_widget) return; - + menu_bar->m_x = 0; menu_bar->m_y = 0; menu_bar->m_width = m_width; @@ -103,30 +103,30 @@ void wxMDIParentFrame::OnInternalIdle() if (m_justInserted) { GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); - gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 ); - - m_justInserted = FALSE; - return; + gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 ); + + m_justInserted = FALSE; + return; } - + wxFrame::OnInternalIdle(); wxMDIChildFrame *active_child_frame = GetActiveChild(); - + wxNode *node = m_clientWindow->m_children.First(); while (node) { wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); - if (child_frame->m_menuBar) - { - if (child_frame == active_child_frame) - gtk_widget_show( child_frame->m_menuBar->m_widget ); - else - gtk_widget_hide( child_frame->m_menuBar->m_widget ); - } + if (child_frame->m_menuBar) + { + if (child_frame == active_child_frame) + gtk_widget_show( child_frame->m_menuBar->m_widget ); + else + gtk_widget_hide( child_frame->m_menuBar->m_widget ); + } node = node->Next(); } - + /* show/hide parent menu bar as required */ if (m_frameMenuBar) m_frameMenuBar->Show( (active_child_frame == NULL) ); } @@ -139,16 +139,20 @@ void wxMDIParentFrame::GetClientSize(int *width, int *height ) const wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const { if (!m_clientWindow) return (wxMDIChildFrame*) NULL; - + GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); if (!notebook) return (wxMDIChildFrame*) NULL; - + +#if (GTK_MINOR_VERSION > 0) gint i = gtk_notebook_get_current_page( notebook ); +#else + gint i = gtk_notebook_current_page( notebook ); +#endif if (i < 0) return (wxMDIChildFrame*) NULL; - + GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data); if (!page) return (wxMDIChildFrame*) NULL; - + wxNode *node = m_clientWindow->m_children.First(); while (node) { @@ -157,7 +161,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const return child_frame; node = node->Next(); } - + return (wxMDIChildFrame*) NULL; } @@ -279,7 +283,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) } /* the menu bar of the child window is shown in idle time as needed */ - gtk_widget_hide( m_menuBar->m_widget ); + gtk_widget_hide( m_menuBar->m_widget ); /* insert the invisible menu bar into the _parent_ mdi frame */ gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0, 0 ); @@ -338,7 +342,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil gtk_notebook_append_page( notebook, child->m_widget, label_widget ); child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); - + wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->m_parent; parent_frame->m_justInserted = TRUE; } diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index 31b638fb6f..7e8498ea5a 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -413,9 +413,11 @@ gtk_myfixed_size_allocate (GtkWidget *widget, myfixed = GTK_MYFIXED (widget); +#if (GTK_MINOR_VERSION > 0) if (myfixed->shadow_type == GTK_SHADOW_NONE) border = 0; else +#endif border = 2; widget->allocation = *allocation; @@ -424,10 +426,11 @@ gtk_myfixed_size_allocate (GtkWidget *widget, gdk_window_move_resize( widget->window, allocation->x+border, allocation->y+border, #if (GTK_MINOR_VERSION > 0) - allocation->width-border*2, allocation->height-border*2 ); + allocation->width-border*2, allocation->height-border*2 #else - 32000, 32000 ); + 32000, 32000 #endif + ); } children = myfixed->children; -- 2.45.2