X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4c99d6fa89db127a4708ce674595d02eeccf2fc..9c039d08bfbb59c0abcbc705fb49f9b2cb321edf:/src/gtk1/frame.cpp diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 0abf2c82df..bead5e36e2 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -20,22 +20,28 @@ #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 = 28; +const int wxSTATUS_HEIGHT = 25; //----------------------------------------------------------------------------- -// wxFrame +// data //----------------------------------------------------------------------------- +extern wxList wxTopLevelWindows; +extern wxList wxPendingDelete; + +//----------------------------------------------------------------------------- +// "size_allocate" //----------------------------------------------------------------------------- -// 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; @@ -47,12 +53,13 @@ void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, */ win->GtkOnSize( alloc->x, alloc->y, alloc->width, 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 " ); @@ -64,8 +71,24 @@ bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED( win->Close(); return TRUE; -}; +} +//----------------------------------------------------------------------------- +// "configure_event" +//----------------------------------------------------------------------------- + +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; +} + +//----------------------------------------------------------------------------- +// wxFrame //----------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxFrame, wxWindow) @@ -78,30 +101,30 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) wxFrame::wxFrame() { - m_frameMenuBar = NULL; - m_frameStatusBar = NULL; - m_frameToolBar = NULL; + m_frameMenuBar = (wxMenuBar *) NULL; + m_frameStatusBar = (wxStatusBar *) NULL; + m_frameToolBar = (wxToolBar *) NULL; m_sizeSet = FALSE; m_addPrivateChild = FALSE; - m_wxwindow = NULL; - m_mainWindow = NULL; + m_wxwindow = (GtkWidget *) NULL; + m_mainWindow = (GtkWidget *) NULL; wxTopLevelWindows.Insert( this ); -}; +} 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_frameMenuBar = (wxMenuBar *) NULL; + m_frameStatusBar = (wxStatusBar *) NULL; + m_frameToolBar = (wxToolBar *) NULL; m_sizeSet = FALSE; m_addPrivateChild = FALSE; - m_wxwindow = NULL; - m_mainWindow = NULL; + m_wxwindow = (GtkWidget *) NULL; + m_mainWindow = (GtkWidget *) 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, @@ -143,59 +166,85 @@ 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 ) { + 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 ); -}; +} 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 ); -}; +} 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); 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 ) +{ + 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(); +} + void wxFrame::GetClientSize( int *width, int *height ) const { + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxWindow::GetClientSize( width, height ); if (height) { @@ -204,16 +253,33 @@ void wxFrame::GetClientSize( int *width, int *height ) const if (m_frameToolBar) { int y = 0; - m_frameToolBar->GetSize( NULL, &y ); + m_frameToolBar->GetSize( (int *) NULL, &y ); (*height) -= y; } - }; -}; + } +} + +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 ); +} -void wxFrame::GtkOnSize( int x, int y, int width, int height ) +void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height ) { - m_x = x; - m_y = y; + // 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,6 +288,10 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height ) 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 ); @@ -240,16 +310,16 @@ 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 ); + if (m_frameToolBar) m_frameToolBar->GetSize( (int *) NULL, &toolbar_height ); main_y += toolbar_height; main_height -= toolbar_height; @@ -261,28 +331,30 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height ) { 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 ); -}; +} void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) { + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + if ( GetAutoLayout() ) Layout(); else { @@ -291,7 +363,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) return; // do we have exactly one child? - wxWindow *child = NULL; + wxWindow *child = (wxWindow *) NULL; for(wxNode *node = GetChildren()->First(); node; node = node->Next()) { wxWindow *win = (wxWindow *)node->Data(); @@ -307,21 +379,27 @@ 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 ) { + 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)) printf( "wxFrame::AddChild error.\n" ); + if (IS_KIND_OF(child,wxMDIChildFrame)) wxFAIL_MSG( "wxFrame::AddChild error.\n" ); if ( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,wxDialog)) { @@ -348,7 +426,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 ) { @@ -360,102 +438,139 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) 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) { - 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) { - m_addPrivateChild = TRUE; - - m_frameToolBar = new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); + 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; -}; +} -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 ); + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + 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 = (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() ); + + long x, y; + dc.GetTextExtent( "X", &x, &y ); + + int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); + + statusBar->SetSize( -1, -1, 100, height ); + + statusBar->SetFieldsCount( number ); + return statusBar; +} -void wxFrame::SetStatusWidths( int n, int *width ) +void wxFrame::SetStatusText(const wxString& text, int number) { - if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width ); -}; + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + 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[] ) +{ + wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + + 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 ) { + 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::SetSizeHints(int minW, int minH, int maxW, int 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 ); } 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 = NULL; + 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 ); }