X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e55ad60e195f1007db921b2a73a3cac98ed9df65..e29b83a455bead3dae44300f631d07aa9635d3e9:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index bead5e36e2..707f419dec 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -2,9 +2,8 @@ // Name: frame.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,15 +18,18 @@ #include "wx/menu.h" #include "wx/toolbar.h" #include "wx/statusbr.h" -#include "wx/mdi.h" #include "wx/dcclient.h" + +#include "glib.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- -const int wxMENU_HEIGHT = 28; +const int wxMENU_HEIGHT = 27; const int wxSTATUS_HEIGHT = 25; //----------------------------------------------------------------------------- @@ -43,16 +45,21 @@ extern wxList wxPendingDelete; static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) { - if (!win->HasVMT()) return; + if (!win->HasVMT()) return; /* - printf( "OnFrameResize from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); + printf( "OnFrameResize from " ); + if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) + printf( win->GetClassInfo()->GetClassName() ); + printf( ".\n" ); */ - win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height ); + if ((win->m_width != alloc->width) || (win->m_height != alloc->height)) + { + win->m_sizeSet = FALSE; + win->m_width = alloc->width; + win->m_height = alloc->height; + } } //----------------------------------------------------------------------------- @@ -62,15 +69,15 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win ) { /* - printf( "OnDelete from " ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - printf( win->GetClassInfo()->GetClassName() ); - printf( ".\n" ); + printf( "OnDelete from " ); + if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) + printf( win->GetClassInfo()->GetClassName() ); + printf( ".\n" ); */ - win->Close(); + win->Close(); - return TRUE; + return TRUE; } //----------------------------------------------------------------------------- @@ -79,12 +86,12 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) { - if (!win->HasVMT()) return FALSE; - - win->m_x = event->x; - win->m_y = event->y; - - return FALSE; + if (!win->HasVMT()) return FALSE; + + win->m_x = event->x; + win->m_y = event->y; + + return FALSE; } //----------------------------------------------------------------------------- @@ -92,485 +99,550 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC //----------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxFrame, wxWindow) - EVT_SIZE(wxFrame::OnSize) - EVT_CLOSE(wxFrame::OnCloseWindow) - EVT_IDLE(wxFrame::OnIdle) + EVT_SIZE(wxFrame::OnSize) + EVT_CLOSE(wxFrame::OnCloseWindow) + EVT_IDLE(wxFrame::OnIdle) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) wxFrame::wxFrame() { - m_frameMenuBar = (wxMenuBar *) NULL; - m_frameStatusBar = (wxStatusBar *) NULL; - m_frameToolBar = (wxToolBar *) NULL; - m_sizeSet = FALSE; - m_addPrivateChild = FALSE; - m_wxwindow = (GtkWidget *) NULL; - m_mainWindow = (GtkWidget *) NULL; - wxTopLevelWindows.Insert( this ); + m_frameMenuBar = (wxMenuBar *) NULL; + m_frameStatusBar = (wxStatusBar *) NULL; + m_frameToolBar = (wxToolBar *) NULL; + m_sizeSet = FALSE; + m_miniEdge = 0; + m_miniTitle = 0; } wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - m_frameMenuBar = (wxMenuBar *) NULL; - m_frameStatusBar = (wxStatusBar *) NULL; - m_frameToolBar = (wxToolBar *) NULL; - m_sizeSet = FALSE; - m_addPrivateChild = FALSE; - m_wxwindow = (GtkWidget *) NULL; - m_mainWindow = (GtkWidget *) NULL; - Create( parent, id, title, pos, size, style, name ); - wxTopLevelWindows.Insert( this ); + m_frameMenuBar = (wxMenuBar *) NULL; + m_frameStatusBar = (wxStatusBar *) NULL; + m_frameToolBar = (wxToolBar *) NULL; + m_sizeSet = FALSE; + m_miniEdge = 0; + m_miniTitle = 0; + Create( parent, id, title, pos, size, style, name ); } bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - m_needParent = FALSE; + wxTopLevelWindows.Append( this ); - PreCreation( parent, id, pos, size, style, name ); + m_needParent = FALSE; - m_title = title; + PreCreation( parent, id, pos, size, style, name ); - m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - if ((size.x != -1) && (size.y != -1)) - gtk_widget_set_usize( m_widget, m_width, m_height ); - if ((pos.x != -1) && (pos.y != -1)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); + m_title = title; + + GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; + if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP; + + m_widget = gtk_window_new( win_type ); - gtk_window_set_title( GTK_WINDOW(m_widget), title ); - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); +#ifdef __WXDEBUG__ + debug_focus_in( m_widget, "wxFrame::m_widget", name ); +#endif + + if ((size.x != -1) && (size.y != -1)) + gtk_widget_set_usize( m_widget, m_width, m_height ); + if ((pos.x != -1) && (pos.y != -1)) + gtk_widget_set_uposition( m_widget, m_x, m_y ); - gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL); + gtk_window_set_title( GTK_WINDOW(m_widget), title ); + GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this ); + gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL ); - m_mainWindow = gtk_myfixed_new(); - gtk_widget_show( m_mainWindow ); - GTK_WIDGET_UNSET_FLAGS( m_mainWindow, GTK_CAN_FOCUS ); + gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", + GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this ); - gtk_container_add( GTK_CONTAINER(m_widget), m_mainWindow ); - gtk_widget_set_uposition( m_mainWindow, 0, 0 ); + m_wxwindow = gtk_myfixed_new(); + gtk_widget_show( m_wxwindow ); + GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); + +#ifdef __WXDEBUG__ + debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name ); +#endif - m_wxwindow = gtk_myfixed_new(); - gtk_widget_show( m_wxwindow ); - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); + gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow ); - gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow ); + gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", + GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this ); + gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", + GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", - GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this ); - - PostCreation(); + if (m_parent) m_parent->AddChild( this ); - gtk_widget_realize( m_mainWindow ); + PostCreation(); - return TRUE; + return TRUE; } wxFrame::~wxFrame() { - if (m_frameMenuBar) delete m_frameMenuBar; - if (m_frameStatusBar) delete m_frameStatusBar; - if (m_frameToolBar) delete m_frameToolBar; + if (m_frameMenuBar) delete m_frameMenuBar; + if (m_frameStatusBar) delete m_frameStatusBar; + if (m_frameToolBar) delete m_frameToolBar; -// if (m_mainWindow) gtk_widget_destroy( m_mainWindow ); - - wxTopLevelWindows.DeleteObject( this ); - if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop(); + wxTopLevelWindows.DeleteObject( this ); + if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop(); } bool wxFrame::Show( bool show ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - if (show) - { - wxSizeEvent event( wxSize(m_width,m_height), GetId() ); - m_sizeSet = FALSE; - ProcessEvent( event ); - } - return wxWindow::Show( show ); -} + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); -void wxFrame::Enable( bool enable ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - if (!m_mainWindow) return; - - wxWindow::Enable( enable ); - gtk_widget_set_sensitive( m_mainWindow, enable ); + if (show && !m_sizeSet) + { + // by calling GtkOnSize here, we don't have to call + // either after showing the frame, which would entail + // much ugly flicker nor from within the size_allocate + // handler, because GTK 1.1.X forbids that. + + GtkOnSize( m_x, m_y, m_width, m_height ); + } + + return wxWindow::Show( show ); } void wxFrame::OnCloseWindow( wxCloseEvent &event ) { - if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy(); + if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy(); } bool wxFrame::Destroy() { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); - return TRUE; + return TRUE; } -void wxFrame::ImplementSetPosition(void) +wxPoint wxFrame::GetClientAreaOrigin() const { - if ((m_x != -1) || (m_y != -1)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); + wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle ); + if (m_frameMenuBar) + { + int h = 0; + m_frameMenuBar->GetSize( (int*)NULL, &h ); + pt.y += h; + } + if (m_frameToolBar) + { + int h = 0; + m_frameToolBar->GetSize( (int*)NULL, &h ); + pt.y += h; + } + return pt; +} + +void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags ) +{ + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + // Don't do anything for children of wxMDIChildFrame + if (!m_wxwindow) return; + + if (m_resizing) return; // I don't like recursions + m_resizing = TRUE; + + int old_x = m_x; + int old_y = m_y; + int old_width = m_width; + int old_height = m_height; + + if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING) + { + if (x != -1) m_x = x; + if (y != -1) m_y = y; + if (width != -1) m_width = width; + if (height != -1) m_height = height; + } + else + { + m_x = x; + m_y = y; + m_width = width; + m_height = height; + } + + if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) + { + if (width == -1) m_width = 80; + } + + if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT) + { + if (height == -1) m_height = 26; + } + + if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; + if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; + if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; + if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; + + if ((m_x != -1) || (m_y != -1)) + { + if ((m_x != old_x) || (m_y != old_y)) + gtk_widget_set_uposition( m_widget, m_x, m_y ); + } + + if ((m_width != old_width) || (m_height != old_height)) + { + gtk_widget_set_usize( m_widget, m_width, m_height ); + } + + wxSizeEvent event( wxSize(m_width,m_height), GetId() ); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); + + m_resizing = FALSE; +} + +void wxFrame::SetSize( int width, int height ) +{ + SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); } void wxFrame::Centre( int direction ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2; - if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2; - ImplementSetPosition(); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + int x = 0; + int y = 0; + + if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2; + if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2; + + Move( x, y ); } void wxFrame::GetClientSize( int *width, int *height ) const { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxWindow::GetClientSize( width, height ); - if (height) - { - if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT; - if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; - if (m_frameToolBar) + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + wxWindow::GetClientSize( width, height ); + if (height) { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - (*height) -= y; + if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT; + if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; + if (m_frameToolBar) + { + int y = 0; + m_frameToolBar->GetSize( (int *) NULL, &y ); + (*height) -= y; + } + (*height) -= m_miniEdge*2 + m_miniTitle; + } + if (width) + { + (*width) -= m_miniEdge*2; } - } } void wxFrame::SetClientSize( int const width, int const height ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - int h = height; - if (m_frameMenuBar) h += wxMENU_HEIGHT; - if (m_frameStatusBar) h += wxSTATUS_HEIGHT; - if (m_frameToolBar) - { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - h += y; - } - wxWindow::SetClientSize( width, h ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + int h = height; + if (m_frameMenuBar) h += wxMENU_HEIGHT; + if (m_frameStatusBar) h += wxSTATUS_HEIGHT; + if (m_frameToolBar) + { + int y = 0; + m_frameToolBar->GetSize( (int *) NULL, &y ); + h += y; + } + wxWindow::SetClientSize( width + m_miniEdge*2, h + m_miniEdge*2 + m_miniTitle ); } void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height ) { - // due to a bug in gtk, x,y are always 0 - // m_x = x; - // m_y = y; - - if ((m_height == height) && (m_width == width) && - (m_sizeSet)) return; - if (!m_mainWindow) return; - if (!m_wxwindow) return; - - m_width = width; - m_height = height; - if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; - if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; - if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; - - gtk_widget_set_usize( m_widget, width, height ); - - int main_x = 0; - int main_y = 0; - int main_height = height; - int main_width = width; - - // This emulates Windows behaviour: - // The menu bar is part of the main window, but the status bar - // is on the implementation side in the client area. The - // function GetClientSize returns the size of the client area - // minus the status bar height. Under wxGTK, the main window - // is represented by m_mainWindow. The menubar is inserted - // into m_mainWindow whereas the statusbar is insertes into - // m_wxwindow just like any other window. - -// not really needed -// gtk_widget_set_usize( m_mainWindow, width, height ); - - if (m_frameMenuBar) - { - main_y = wxMENU_HEIGHT; - main_height -= wxMENU_HEIGHT; - } - - int toolbar_height = 0; - if (m_frameToolBar) m_frameToolBar->GetSize( (int *) NULL, &toolbar_height ); - - main_y += toolbar_height; - main_height -= toolbar_height; - - gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_wxwindow, main_x, main_y ); - gtk_widget_set_usize( m_wxwindow, main_width, main_height ); - - if (m_frameMenuBar) - { - gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameMenuBar->m_widget, 1, 1 ); - gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 ); - } - - if (m_frameToolBar) - { - gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameToolBar->m_widget, 1, wxMENU_HEIGHT ); - gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height ); - } - - if (m_frameStatusBar) - { - m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT ); - } - - m_sizeSet = TRUE; - - wxSizeEvent event( wxSize(m_width,m_height), GetId() ); - event.SetEventObject( this ); - ProcessEvent( event ); + // due to a bug in gtk, x,y are always 0 + // m_x = x; + // m_y = y; + + if (m_resizing) return; + m_resizing = TRUE; + + if (!m_wxwindow) return; + + m_width = width; + m_height = height; + + if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; + if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; + if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; + if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; + + gtk_widget_set_usize( m_widget, m_width, m_height ); + + // this emulates the new wxMSW behaviour of placing all + // frame-subwindows (menu, toolbar..) on one native window + // OK, this hurts in the eye, but I don't want to call SetSize() + // because I don't want to call any non-native functions here. + + if (m_frameMenuBar) + { + int xx = m_miniEdge; + int yy = m_miniEdge + m_miniTitle; + int ww = m_width - 2*m_miniEdge; + int hh = wxMENU_HEIGHT; + m_frameMenuBar->m_x = xx; + m_frameMenuBar->m_y = yy; + m_frameMenuBar->m_width = ww; + m_frameMenuBar->m_height = hh; + + gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy ); + gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh ); + } + + if (m_frameToolBar) + { + int xx = m_miniEdge; + int yy = m_miniEdge + m_miniTitle; + if (m_frameMenuBar) yy += wxMENU_HEIGHT; + int ww = m_width - 2*m_miniEdge; + int hh = m_frameToolBar->m_height; + + m_frameToolBar->m_x = xx; + m_frameToolBar->m_y = yy; + m_frameToolBar->m_height = hh; + m_frameToolBar->m_width = ww; + + gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy ); + gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh ); + } + + if (m_frameStatusBar) + { + int xx = 0 + m_miniEdge; + int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge; + int ww = m_width - 2*m_miniEdge; + int hh = wxSTATUS_HEIGHT; + + m_frameStatusBar->m_x = xx; + m_frameStatusBar->m_y = yy; + m_frameStatusBar->m_width = ww; + m_frameStatusBar->m_height = hh; + + gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy ); + gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh ); + } + + m_sizeSet = TRUE; + + wxSizeEvent event( wxSize(m_width,m_height), GetId() ); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); + + m_resizing = FALSE; +} + +void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) ) +{ + if (!m_sizeSet) + GtkOnSize( m_x, m_y, m_width, m_height ); + + DoMenuUpdates(); } void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - if ( GetAutoLayout() ) - Layout(); - else { - // no child: go out ! - if (!GetChildren()->First()) - return; - - // do we have exactly one child? - wxWindow *child = (wxWindow *) NULL; - for(wxNode *node = GetChildren()->First(); node; node = node->Next()) + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + if (GetAutoLayout()) + { + Layout(); + } + else { - wxWindow *win = (wxWindow *)node->Data(); - if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog) -#if 0 // not in m_children anyway - && (win != m_frameMenuBar) && - (win != m_frameToolBar) && - (win != m_frameStatusBar) + // no child: go out ! + if (!GetChildren().First()) return; + + // 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 ( child ) // it's the second one: do nothing - return; - - child = win; - } + ) + { + // it's the second one: do nothing + if (child) return; + child = win; + } + } + + // 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 ); } - - // 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); - } -} - -void wxFrame::AddChild( wxWindow *child ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" ); - wxASSERT_MSG( (m_mainWindow != NULL), "invalid frame" ); - wxASSERT_MSG( (child != NULL), "invalid child" ); - wxASSERT_MSG( (child->m_widget != NULL), "invalid child" ); - - // wxFrame and wxDialog as children aren't placed into the parents - - if (IS_KIND_OF(child,wxMDIChildFrame)) wxFAIL_MSG( "wxFrame::AddChild error.\n" ); - - if ( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,wxDialog)) - { - m_children.Append( child ); - - if ((child->m_x != -1) && (child->m_y != -1)) - gtk_widget_set_uposition( child->m_widget, child->m_x, child->m_y ); - - return; - } - - if (m_addPrivateChild) - { - gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), child->m_widget, child->m_x, child->m_y ); - - gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height ); - } - else - { - m_children.Append( child ); - - if (m_wxwindow) - gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y ); - - gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height ); - } } static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { - menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); - while (node) - { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); - if (menuitem->IsSubMenu()) - SetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); - } + menu->SetInvokingWindow( win ); + wxNode *node = menu->m_items.First(); + while (node) + { + wxMenuItem *menuitem = (wxMenuItem*)node->Data(); + if (menuitem->IsSubMenu()) + SetInvokingWindow( menuitem->GetSubMenu(), win ); + node = node->Next(); + } } void wxFrame::SetMenuBar( wxMenuBar *menuBar ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" ); - wxASSERT_MSG( (m_mainWindow != NULL), "invalid frame" ); - - m_frameMenuBar = menuBar; - - if (m_frameMenuBar) - { - wxNode *node = m_frameMenuBar->m_menus.First(); - while (node) - { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); - } - - if (m_frameMenuBar->m_parent != this) + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" ); + + m_frameMenuBar = menuBar; + + if (m_frameMenuBar) { - m_frameMenuBar->m_parent = this; - gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), - m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); + wxNode *node = m_frameMenuBar->m_menus.First(); + while (node) + { + wxMenu *menu = (wxMenu*)node->Data(); + SetInvokingWindow( menu, this ); + node = node->Next(); + } + + if (m_frameMenuBar->m_parent != this) + { + m_frameMenuBar->m_parent = this; + gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), + m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); + } } - } + + if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height ); } -wxMenuBar *wxFrame::GetMenuBar(void) const +wxMenuBar *wxFrame::GetMenuBar() const { - return m_frameMenuBar; + return m_frameMenuBar; } wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" ); - m_addPrivateChild = TRUE; - m_frameToolBar = OnCreateToolBar( style, id, name ); - m_addPrivateChild = FALSE; - - return m_frameToolBar; + m_frameToolBar = OnCreateToolBar( style, id, name ); + + GetChildren().DeleteObject( m_frameToolBar ); + + if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height ); + + return m_frameToolBar; } wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name ) { - return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); + return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); } -wxToolBar *wxFrame::GetToolBar(void) const -{ - return m_frameToolBar; +wxToolBar *wxFrame::GetToolBar() const +{ + return m_frameToolBar; } wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); - - return m_frameStatusBar; + wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); + + m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); + + if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height ); + + return m_frameStatusBar; } wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { - wxStatusBar *statusBar = (wxStatusBar *) NULL; - - statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name); - - // Set the height according to the font and the border size - wxClientDC dc(statusBar); - dc.SetFont( *statusBar->GetFont() ); + wxStatusBar *statusBar = (wxStatusBar *) NULL; + + statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name); - long x, y; - dc.GetTextExtent( "X", &x, &y ); + // Set the height according to the font and the border size + wxClientDC dc(statusBar); + dc.SetFont( statusBar->GetFont() ); - int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); + long x, y; + dc.GetTextExtent( "X", &x, &y ); - statusBar->SetSize( -1, -1, 100, height ); + int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); - statusBar->SetFieldsCount( number ); - return statusBar; + statusBar->SetSize( -1, -1, 100, height ); + + statusBar->SetFieldsCount( number ); + return statusBar; } void wxFrame::SetStatusText(const wxString& text, int number) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); - m_frameStatusBar->SetStatusText(text, number); + m_frameStatusBar->SetStatusText(text, number); } void wxFrame::SetStatusWidths(int n, const int widths_field[] ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - m_frameStatusBar->SetStatusWidths(n, widths_field); + wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); + + m_frameStatusBar->SetStatusWidths(n, widths_field); } -wxStatusBar *wxFrame::GetStatusBar(void) const +wxStatusBar *wxFrame::GetStatusBar() const { - return m_frameStatusBar; + return m_frameStatusBar; } void wxFrame::SetTitle( const wxString &title ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - m_title = title; - if (m_title.IsNull()) m_title = ""; - gtk_window_set_title( GTK_WINDOW(m_widget), title ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + m_title = title; + if (m_title.IsNull()) m_title = ""; + gtk_window_set_title( GTK_WINDOW(m_widget), title ); } void wxFrame::SetIcon( const wxIcon &icon ) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - m_icon = icon; - if (!icon.Ok()) return; - - wxMask *mask = icon.GetMask(); - GdkBitmap *bm = (GdkBitmap *) NULL; - if (mask) bm = mask->GetBitmap(); - - gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + m_icon = icon; + if (!icon.Ok()) return; + + wxMask *mask = icon.GetMask(); + GdkBitmap *bm = (GdkBitmap *) NULL; + if (mask) bm = mask->GetBitmap(); + + gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm ); }