X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d553992a3c1aa98ae615b9e009ea23fcbcab0242..5523168ef108f3c45628c1399db5b3f794bd1564:/src/gtk1/frame.cpp diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 7424ec63fc..4c987eacfd 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/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,526 +18,619 @@ #include "wx/menu.h" #include "wx/toolbar.h" #include "wx/statusbr.h" -#include "wx/mdi.h" #include "wx/dcclient.h" #include "wx/gtk/win_gtk.h" -const wxMENU_HEIGHT = 28; -const wxSTATUS_HEIGHT = 25; +//----------------------------------------------------------------------------- +// constants +//----------------------------------------------------------------------------- -extern wxList wxTopLevelWindows; -extern wxList wxPendingDelete; +const int wxMENU_HEIGHT = 27; +const int wxSTATUS_HEIGHT = 25; //----------------------------------------------------------------------------- -// wxFrame +// data //----------------------------------------------------------------------------- +extern wxList wxTopLevelWindows; +extern wxList wxPendingDelete; + +//----------------------------------------------------------------------------- +// "size_allocate" //----------------------------------------------------------------------------- -// set size -void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) +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; + } } //----------------------------------------------------------------------------- -// delete +// "delete_event" +//----------------------------------------------------------------------------- -bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win ) +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; } //----------------------------------------------------------------------------- -// configure +// "configure_event" +//----------------------------------------------------------------------------- -gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) +static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) { - if (!win->HasVMT()) return FALSE; + if (!win->HasVMT()) return FALSE; - win->m_x = event->x; - win->m_y = event->y; + win->m_x = event->x; + win->m_y = event->y; - return FALSE; + return FALSE; } +//----------------------------------------------------------------------------- +// wxFrame //----------------------------------------------------------------------------- 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 = NULL; - m_frameStatusBar = NULL; - m_frameToolBar = NULL; - m_sizeSet = FALSE; - m_addPrivateChild = FALSE; - m_wxwindow = NULL; - m_mainWindow = 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 = NULL; - m_frameStatusBar = NULL; - m_frameToolBar = NULL; - m_sizeSet = FALSE; - m_addPrivateChild = FALSE; - m_wxwindow = NULL; - m_mainWindow = 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; - - PreCreation( parent, id, pos, size, style, name ); + wxTopLevelWindows.Append( this ); + + 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; - gtk_window_set_title( GTK_WINDOW(m_widget), title ); - GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - - gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL); + GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; + if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP; + + m_widget = gtk_window_new( win_type ); + + 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_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this ); + gtk_window_set_title( GTK_WINDOW(m_widget), title ); + GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - m_mainWindow = gtk_myfixed_new(); - gtk_widget_show( m_mainWindow ); - GTK_WIDGET_UNSET_FLAGS( m_mainWindow, GTK_CAN_FOCUS ); + gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL ); - gtk_container_add( GTK_CONTAINER(m_widget), m_mainWindow ); - gtk_widget_set_uposition( m_mainWindow, 0, 0 ); + gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", + GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this ); - m_wxwindow = gtk_myfixed_new(); - gtk_widget_show( m_wxwindow ); - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); + 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_mainWindow), m_wxwindow ); + gtk_container_add( GTK_CONTAINER(m_widget), 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(); - - gtk_widget_realize( m_mainWindow ); - - return TRUE; + if (m_parent) m_parent->AddChild( this ); + + PostCreation(); + + 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 ) { - 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" ); + + 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::Enable( bool enable ) +void wxFrame::OnCloseWindow( wxCloseEvent &event ) { - wxWindow::Enable( enable ); - gtk_widget_set_sensitive( m_mainWindow, enable ); + if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy(); } -void wxFrame::OnCloseWindow( wxCloseEvent &event ) +bool wxFrame::Destroy() { - if ( GetEventHandler()->OnClose() || event.GetForce()) + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); + + return TRUE; +} + +wxPoint wxFrame::GetClientAreaOrigin() const +{ + wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle ); + if (m_frameMenuBar) { - this->Destroy(); + 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; } -bool wxFrame::Destroy() +void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags ) { - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); + wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + + // Don't do anything for children of wxMDIChildFrame + if (!m_wxwindow) return; - return TRUE; + 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::ImplementSetPosition(void) +void wxFrame::SetSize( int width, int height ) { - if ((m_x != -1) || (m_y != -1)) - gtk_widget_set_uposition( m_widget, m_x, m_y ); + SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); } void wxFrame::Centre( int direction ) { - 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 { - 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) + { + 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) { - int y = 0; - m_frameToolBar->GetSize( NULL, &y ); - (*height) -= y; + (*width) -= m_miniEdge*2; } - } } void wxFrame::SetClientSize( int const width, int const height ) { - int h = height; - if (m_frameMenuBar) h += wxMENU_HEIGHT; - if (m_frameStatusBar) h += wxSTATUS_HEIGHT; - if (m_frameToolBar) - { - int y = 0; - m_frameToolBar->GetSize( 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; + // due to a bug in gtk, x,y are always 0 + // m_x = x; + // m_y = y; - // VZ: why?? - //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( NULL, &toolbar_height ); + if (m_resizing) return; + m_resizing = TRUE; + + if (!m_wxwindow) return; - main_y += toolbar_height; - main_height -= toolbar_height; + m_width = width; + m_height = 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_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_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 ); - } + 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) - { - 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_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) - { - 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 ); -} - -void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) -{ - if ( GetAutoLayout() ) - Layout(); - else { - // no child: go out ! - if (!GetChildren()->First()) - return; - - // do we have exactly one child? - wxWindow *child = NULL; - for(wxNode *node = GetChildren()->First(); node; node = node->Next()) + if (m_frameStatusBar) { - 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) -#endif - ) - { - if ( child ) // it's the second one: do nothing - return; - - child = win; - } + 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 ); } - - // 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); - } + + m_sizeSet = TRUE; + + wxSizeEvent event( wxSize(m_width,m_height), GetId() ); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); + + m_resizing = FALSE; } -void wxFrame::AddChild( wxWindow *child ) +void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) ) { - // wxFrame and wxDialog as children aren't placed into the parents - - if (IS_KIND_OF(child,wxMDIChildFrame)) printf( "wxFrame::AddChild error.\n" ); + if (!m_sizeSet) + GtkOnSize( m_x, m_y, m_width, m_height ); - 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; - } + DoMenuUpdates(); +} + +void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) +{ + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - 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 ); + if (GetAutoLayout()) + { + Layout(); + } + else + { + // no child: go out ! + if (!GetChildren()->First()) return; - gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height ); - } + // 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 (!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) +#endif + ) + { + // 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 ); + } } 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 ) { - m_frameMenuBar = menuBar; + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" ); - if (m_frameMenuBar) - { - wxNode *node = m_frameMenuBar->m_menus.First(); - while (node) + m_frameMenuBar = menuBar; + + if (m_frameMenuBar) { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); - } + 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_mainWindow), - m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); + 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 { - return m_frameMenuBar; + return m_frameMenuBar; } wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { - 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; + 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; + 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; + return m_frameToolBar; } wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); - m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); + m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); - return m_frameStatusBar; + 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 = NULL; + wxStatusBar *statusBar = (wxStatusBar *) NULL; - statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name); + 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() ); + // Set the height according to the font and the border size + wxClientDC dc(statusBar); + dc.SetFont( *statusBar->GetFont() ); - long x, y; - dc.GetTextExtent( "X", &x, &y ); + long x, y; + dc.GetTextExtent( "X", &x, &y ); - int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); + int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); - statusBar->SetSize( -1, -1, 100, height ); + statusBar->SetSize( -1, -1, 100, height ); - statusBar->SetFieldsCount( number ); - return statusBar; + statusBar->SetFieldsCount( number ); + return statusBar; } void wxFrame::SetStatusText(const wxString& text, int number) { - 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[] ) { - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); - m_frameStatusBar->SetStatusWidths(n, widths_field); + m_frameStatusBar->SetStatusWidths(n, widths_field); } wxStatusBar *wxFrame::GetStatusBar(void) const { - return m_frameStatusBar; + return m_frameStatusBar; } void wxFrame::SetTitle( const wxString &title ) { - m_title = title; - if (m_title.IsNull()) m_title = ""; - gtk_window_set_title( GTK_WINDOW(m_widget), title ); -} - -void wxFrame::SetSizeHints(int minW, int minH, - int WXUNUSED(maxW), int WXUNUSED(maxH), - int WXUNUSED(incW) ) -{ - // gdk_window_set_hints alone doesn't really prevent the user from shrinking - // the window to the size smaller than (minW, minH) - gtk_widget_set_usize( GTK_WIDGET(m_widget), minW, minH ); - - /* - gdk_window_set_hints( m_widget->window, -1, -1, - minW, minH, maxW, maxH, - GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE ); - */ + 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 ) { - m_icon = icon; - if (!icon.Ok()) return; + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + m_icon = icon; + if (!icon.Ok()) return; - wxMask *mask = icon.GetMask(); - GdkBitmap *bm = NULL; - if (mask) bm = mask->GetBitmap(); + wxMask *mask = icon.GetMask(); + GdkBitmap *bm = (GdkBitmap *) NULL; + if (mask) bm = mask->GetBitmap(); - gdk_window_set_icon( m_widget->window, NULL, icon.GetPixmap(), bm ); + gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm ); }