X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf4219e77adb387bd514b83e0c841f563b4016c6..4c444f19cf1bdb3cb26bb3c123434fe23c808093:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 5a39066f38..7424ec63fc 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -19,6 +19,8 @@ #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; @@ -32,7 +34,7 @@ extern wxList wxPendingDelete; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// size +// set size void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) { @@ -46,7 +48,7 @@ void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, */ win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height ); -}; +} //----------------------------------------------------------------------------- // delete @@ -63,7 +65,20 @@ bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED( win->Close(); return TRUE; -}; +} + +//----------------------------------------------------------------------------- +// configure + +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; +} //----------------------------------------------------------------------------- @@ -85,7 +100,7 @@ wxFrame::wxFrame() m_wxwindow = NULL; m_mainWindow = NULL; wxTopLevelWindows.Insert( this ); -}; +} wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, @@ -100,7 +115,7 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, m_mainWindow = NULL; Create( parent, id, title, pos, size, style, name ); wxTopLevelWindows.Insert( this ); -}; +} bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, @@ -142,23 +157,27 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, 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 ); + PostCreation(); gtk_widget_realize( m_mainWindow ); return TRUE; -}; +} wxFrame::~wxFrame() { 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(); -}; +} bool wxFrame::Show( bool show ) { @@ -167,15 +186,15 @@ bool wxFrame::Show( bool show ) wxSizeEvent event( wxSize(m_width,m_height), GetId() ); m_sizeSet = FALSE; ProcessEvent( event ); - }; + } return wxWindow::Show( show ); -}; +} void wxFrame::Enable( bool enable ) { wxWindow::Enable( enable ); gtk_widget_set_sensitive( m_mainWindow, enable ); -}; +} void wxFrame::OnCloseWindow( wxCloseEvent &event ) { @@ -183,7 +202,7 @@ void wxFrame::OnCloseWindow( wxCloseEvent &event ) { this->Destroy(); } -}; +} bool wxFrame::Destroy() { @@ -193,6 +212,19 @@ bool wxFrame::Destroy() return TRUE; } +void wxFrame::ImplementSetPosition(void) +{ + if ((m_x != -1) || (m_y != -1)) + gtk_widget_set_uposition( m_widget, m_x, m_y ); +} + +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(); +} + void wxFrame::GetClientSize( int *width, int *height ) const { wxWindow::GetClientSize( width, height ); @@ -206,13 +238,28 @@ void wxFrame::GetClientSize( int *width, int *height ) const m_frameToolBar->GetSize( NULL, &y ); (*height) -= y; } - }; -}; + } +} -void wxFrame::GtkOnSize( int x, int y, int width, int height ) +void wxFrame::SetClientSize( int const width, int const height ) { - m_x = x; - m_y = y; + 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 ); +} + +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; @@ -222,7 +269,8 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height ) m_width = width; m_height = height; - gtk_widget_set_usize( m_widget, width, height ); + // VZ: why?? + //gtk_widget_set_usize( m_widget, width, height ); int main_x = 0; int main_y = 0; @@ -239,13 +287,13 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height ) // m_wxwindow just like any other window. // not really needed - gtk_widget_set_usize( m_mainWindow, width, height ); +// 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 ); @@ -253,32 +301,32 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height ) main_y += toolbar_height; main_height -= toolbar_height; - gtk_widget_set_uposition( GTK_WIDGET(m_wxwindow), main_x, main_y ); - gtk_widget_set_usize( GTK_WIDGET(m_wxwindow), main_width, main_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_widget_set_uposition( m_frameMenuBar->m_widget, 1, 1 ); + 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_widget_set_uposition( m_frameToolBar->m_widget, 1, wxMENU_HEIGHT ); + 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 ); -}; +} void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) { @@ -306,21 +354,23 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) 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); } -}; +} void wxFrame::AddChild( wxWindow *child ) { // wxFrame and wxDialog as children aren't placed into the parents - if (child->IsKindOf(CLASSINFO(wxFrame)) || child->IsKindOf(CLASSINFO(wxDialog))) + if (IS_KIND_OF(child,wxMDIChildFrame)) printf( "wxFrame::AddChild error.\n" ); + + if ( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,wxDialog)) { m_children.Append( child ); @@ -345,7 +395,7 @@ void wxFrame::AddChild( wxWindow *child ) gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height ); } -}; +} static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) { @@ -357,8 +407,8 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) if (menuitem->IsSubMenu()) SetInvokingWindow( menuitem->GetSubMenu(), win ); node = node->Next(); - }; -}; + } +} void wxFrame::SetMenuBar( wxMenuBar *menuBar ) { @@ -366,82 +416,118 @@ void wxFrame::SetMenuBar( wxMenuBar *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) { - wxNode *node = m_frameMenuBar->m_menus.First(); - while (node) - { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); - }; - m_frameMenuBar->m_parent = this; gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); } } -}; +} -wxMenuBar *wxFrame::GetMenuBar(void) +wxMenuBar *wxFrame::GetMenuBar(void) const { return m_frameMenuBar; -}; +} -wxToolBar *wxFrame::CreateToolBar( long style , wxWindowID id, const wxString& name ) +wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { + wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" ); + m_addPrivateChild = TRUE; - - m_frameToolBar = new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); - + m_frameToolBar = OnCreateToolBar( style, id, name ); m_addPrivateChild = FALSE; return m_frameToolBar; -}; +} -wxToolBar *wxFrame::GetToolBar(void) +wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name ) { - return m_frameToolBar; -}; + return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); +} + +wxToolBar *wxFrame::GetToolBar(void) const +{ + return m_frameToolBar; +} wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { - if (m_frameStatusBar) - delete m_frameStatusBar; - - m_frameStatusBar = new wxStatusBar( this, id, wxPoint(0,0), wxSize(100,20), style, name ); + wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); - m_frameStatusBar->SetFieldsCount( number ); + m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); return m_frameStatusBar; -}; +} -void wxFrame::SetStatusText( const wxString &text, int number ) +wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) { - if (m_frameStatusBar) m_frameStatusBar->SetStatusText( text, number ); -}; + wxStatusBar *statusBar = 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() ); + + long x, y; + dc.GetTextExtent( "X", &x, &y ); + + int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); -void wxFrame::SetStatusWidths( int n, int *width ) + statusBar->SetSize( -1, -1, 100, height ); + + statusBar->SetFieldsCount( number ); + return statusBar; +} + +void wxFrame::SetStatusText(const wxString& text, int number) { - if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width ); -}; + wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); + + m_frameStatusBar->SetStatusText(text, number); +} -wxStatusBar *wxFrame::GetStatusBar(void) +void wxFrame::SetStatusWidths(int n, const int widths_field[] ) +{ + wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); + + m_frameStatusBar->SetStatusWidths(n, widths_field); +} + +wxStatusBar *wxFrame::GetStatusBar(void) const { 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 maxW, int maxH, int WXUNUSED(incW) ) +void wxFrame::SetSizeHints(int minW, int minH, + int WXUNUSED(maxW), int WXUNUSED(maxH), + int WXUNUSED(incW) ) { - if (m_wxwindow) - gdk_window_set_hints( m_wxwindow->window, -1, -1, - minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE ); + // 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 ); + */ } void wxFrame::SetIcon( const wxIcon &icon )