X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f94fca1b74c149f3a3450ba4a8d8e33386eb8f6d..d9ff0f91fbddae88286567cab74dcfb59c91fc0f:/src/gtk/frame.cpp?ds=sidebyside diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 97e19ac404..fb364d258e 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -23,7 +23,8 @@ #define XIconifyWindow XICONIFYWINDOW #endif -#include "wx/frame.h" +#include "wx/defs.h" + #include "wx/dialog.h" #include "wx/control.h" #include "wx/app.h" @@ -64,7 +65,9 @@ extern int g_openDialogs; // event tables // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) +#ifndef __WXUNIVERSAL__ + IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) +#endif // ---------------------------------------------------------------------------- // data @@ -108,7 +111,7 @@ static gint gtk_frame_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUS // "size_allocate" //----------------------------------------------------------------------------- -static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win ) +static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrameGTK *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -139,7 +142,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* // "delete_event" //----------------------------------------------------------------------------- -static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win ) +static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrameGTK *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -150,11 +153,13 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX return TRUE; } +#if wxUSE_MENUS_NATIVE + //----------------------------------------------------------------------------- // "child_attached" of menu bar //----------------------------------------------------------------------------- -static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win ) { if (!win->m_hasVMT) return; @@ -166,7 +171,7 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * // "child_detached" of menu bar //----------------------------------------------------------------------------- -static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win ) { if (!win->m_hasVMT) return; @@ -174,12 +179,14 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * win->GtkUpdateSize(); } +#endif // wxUSE_MENUS_NATIVE + #if wxUSE_TOOLBAR //----------------------------------------------------------------------------- // "child_attached" of tool bar //----------------------------------------------------------------------------- -static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win ) { if (!win->m_hasVMT) return; @@ -192,7 +199,7 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge // "child_detached" of tool bar //----------------------------------------------------------------------------- -static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) +static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -210,9 +217,9 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge static gint #if (GTK_MINOR_VERSION > 0) -gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win ) +gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrameGTK *win ) #else -gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) +gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrameGTK *win ) #endif { if (g_isIdle) @@ -247,7 +254,7 @@ gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *ev so we do this directly after realization */ static void -gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win ) +gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrameGTK *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -375,26 +382,26 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW } // ---------------------------------------------------------------------------- -// wxFrame itself +// wxFrameGTK itself // ---------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// InsertChild for wxFrame +// InsertChild for wxFrameGTK //----------------------------------------------------------------------------- -/* Callback for wxFrame. This very strange beast has to be used because +/* Callback for wxFrameGTK. This very strange beast has to be used because * C++ has no virtual methods in a constructor. We have to emulate a * virtual function here as wxWindows requires different ways to insert * a child in container classes. */ -static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) +static void wxInsertChildInFrame( wxFrameGTK* parent, wxWindow* child ) { wxASSERT( GTK_IS_WIDGET(child->m_widget) ); if (!parent->m_insertInClientArea) { /* these are outside the client area */ - wxFrame* frame = (wxFrame*) parent; + wxFrameGTK* frame = (wxFrameGTK*) parent; gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget), GTK_WIDGET(child->m_widget), child->m_x, @@ -435,10 +442,10 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) } // ---------------------------------------------------------------------------- -// wxFrame creation +// wxFrameGTK creation // ---------------------------------------------------------------------------- -void wxFrame::Init() +void wxFrameGTK::Init() { m_sizeSet = FALSE; m_miniEdge = 0; @@ -453,7 +460,7 @@ void wxFrame::Init() m_themeEnabled = TRUE; } -bool wxFrame::Create( wxWindow *parent, +bool wxFrameGTK::Create( wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos, @@ -480,7 +487,7 @@ bool wxFrame::Create( wxWindow *parent, if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( wxT("wxFrame creation failed") ); + wxFAIL_MSG( wxT("wxFrameGTK creation failed") ); return FALSE; } @@ -502,7 +509,7 @@ bool wxFrame::Create( wxWindow *parent, gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); #ifdef __WXDEBUG__ - debug_focus_in( m_widget, wxT("wxFrame::m_widget"), name ); + debug_focus_in( m_widget, wxT("wxFrameGTK::m_widget"), name ); #endif gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() ); @@ -524,7 +531,7 @@ bool wxFrame::Create( wxWindow *parent, GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); #ifdef __WXDEBUG__ - debug_focus_in( m_mainWidget, wxT("wxFrame::m_mainWidget"), name ); + debug_focus_in( m_mainWidget, wxT("wxFrameGTK::m_mainWidget"), name ); #endif /* m_wxwindow only represents the client area without toolbar and menubar */ @@ -533,7 +540,7 @@ bool wxFrame::Create( wxWindow *parent, gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow ); #ifdef __WXDEBUG__ - debug_focus_in( m_wxwindow, wxT("wxFrame::m_wxwindow"), name ); + debug_focus_in( m_wxwindow, wxT("wxFrameGTK::m_wxwindow"), name ); #endif /* we donm't allow the frame to get the focus as otherwise @@ -578,7 +585,7 @@ bool wxFrame::Create( wxWindow *parent, return TRUE; } -wxFrame::~wxFrame() +wxFrameGTK::~wxFrameGTK() { m_isBeingDeleted = TRUE; @@ -596,7 +603,7 @@ wxFrame::~wxFrame() } } -bool wxFrame::ShowFullScreen(bool show, long style ) +bool wxFrameGTK::ShowFullScreen(bool show, long style ) { if (show == m_fsIsShowing) return FALSE; // return what? @@ -642,7 +649,7 @@ bool wxFrame::ShowFullScreen(bool show, long style ) // overridden wxWindow methods // ---------------------------------------------------------------------------- -bool wxFrame::Show( bool show ) +bool wxFrameGTK::Show( bool show ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); @@ -659,16 +666,16 @@ bool wxFrame::Show( bool show ) return wxWindow::Show( show ); } -void wxFrame::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) +void wxFrameGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) { - wxFAIL_MSG( wxT("DoMoveWindow called for wxFrame") ); + wxFAIL_MSG( wxT("DoMoveWindow called for wxFrameGTK") ); } -void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) +void wxFrameGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ + /* this shouldn't happen: wxFrameGTK, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); /* avoid recursions */ @@ -735,13 +742,14 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) m_resizing = FALSE; } -void wxFrame::DoGetClientSize( int *width, int *height ) const +void wxFrameGTK::DoGetClientSize( int *width, int *height ) const { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxWindow::DoGetClientSize( width, height ); if (height) { +#if wxUSE_MENUS /* menu bar */ if (m_frameMenuBar) { @@ -750,6 +758,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const else (*height) -= wxPLACE_HOLDER; } +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR /* status bar */ @@ -789,10 +798,11 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const } } -void wxFrame::DoSetClientSize( int width, int height ) +void wxFrameGTK::DoSetClientSize( int width, int height ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); +#if wxUSE_MENUS /* menu bar */ if (m_frameMenuBar) { @@ -801,6 +811,7 @@ void wxFrame::DoSetClientSize( int width, int height ) else height += wxPLACE_HOLDER; } +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR /* status bar */ @@ -834,7 +845,7 @@ void wxFrame::DoSetClientSize( int width, int height ) DoSetSize( -1, -1, width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle, 0 ); } -void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), +void wxFrameGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height ) { // due to a bug in gtk, x,y are always 0 @@ -845,7 +856,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), if (m_resizing) return; m_resizing = TRUE; - /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ + /* this shouldn't happen: wxFrameGTK, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */ wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); m_width = width; @@ -855,9 +866,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int client_area_x_offset = 0, client_area_y_offset = 0; - /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses + /* wxMDIChildFrame derives from wxFrameGTK but it _is_ a wxWindow as it uses wxWindow::Create to create it's GTK equivalent. m_mainWidget is only - set in wxFrame::Create so it is used to check what kind of frame we + set in wxFrameGTK::Create so it is used to check what kind of frame we have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we skip the part which handles m_frameMenuBar, m_frameToolBar and (most importantly) m_mainWidget */ @@ -889,6 +900,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), * 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 wxUSE_MENUS if (m_frameMenuBar) { int xx = m_miniEdge; @@ -905,6 +917,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), xx, yy, ww, hh ); client_area_y_offset += hh; } +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR if ((m_frameToolBar) && m_frameToolBar->IsShown() && @@ -912,6 +925,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), { int xx = m_miniEdge; int yy = m_miniEdge + m_miniTitle; +#if wxUSE_MENUS if (m_frameMenuBar) { if (!m_menuBarDetached) @@ -919,6 +933,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), else yy += wxPLACE_HOLDER; } +#endif // wxUSE_MENUS m_frameToolBar->m_x = xx; m_frameToolBar->m_y = yy; @@ -978,7 +993,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), xx, yy, ww, hh ); gtk_widget_draw( m_frameStatusBar->m_widget, (GdkRectangle*) NULL ); } -#endif +#endif // wxUSE_STATUSBAR m_sizeSet = TRUE; @@ -987,6 +1002,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); +#if wxUSE_STATUSBAR // send size event to status bar if (m_frameStatusBar) { @@ -994,11 +1010,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 ); } +#endif // wxUSE_STATUSBAR m_resizing = FALSE; } -void wxFrame::MakeModal( bool modal ) +void wxFrameGTK::MakeModal( bool modal ) { if (modal) gtk_grab_add( m_widget ); @@ -1006,7 +1023,7 @@ void wxFrame::MakeModal( bool modal ) gtk_grab_remove( m_widget ); } -void wxFrame::OnInternalIdle() +void wxFrameGTK::OnInternalIdle() { if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow)) { @@ -1018,7 +1035,9 @@ void wxFrame::OnInternalIdle() return; } +#if wxUSE_MENUS if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); +#endif // wxUSE_MENUS #if wxUSE_TOOLBAR if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); #endif @@ -1033,15 +1052,14 @@ void wxFrame::OnInternalIdle() // menu/tool/status bar stuff // ---------------------------------------------------------------------------- -void wxFrame::SetMenuBar( wxMenuBar *menuBar ) +#if wxUSE_MENUS_NATIVE + +void wxFrameGTK::DetachMenuBar() { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); - if (menuBar == m_frameMenuBar) - return; - - if (m_frameMenuBar) + if ( m_frameMenuBar ) { m_frameMenuBar->UnsetInvokingWindow( this ); @@ -1059,7 +1077,12 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) gtk_widget_unparent( m_frameMenuBar->m_widget ); } - m_frameMenuBar = menuBar; + wxFrameBase::DetachMenuBar(); +} + +void wxFrameGTK::AttachMenuBar( wxMenuBar *menuBar ) +{ + wxFrameBase::AttachMenuBar(menuBar); if (m_frameMenuBar) { @@ -1089,8 +1112,11 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) m_sizeSet = FALSE; } +#endif // wxUSE_MENUS_NATIVE + #if wxUSE_TOOLBAR -wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name ) + +wxToolBar* wxFrameGTK::CreateToolBar( long style, wxWindowID id, const wxString& name ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); @@ -1105,7 +1131,7 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na return m_frameToolBar; } -void wxFrame::SetToolBar(wxToolBar *toolbar) +void wxFrameGTK::SetToolBar(wxToolBar *toolbar) { wxFrameBase::SetToolBar(toolbar); @@ -1127,7 +1153,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar) #if wxUSE_STATUSBAR -wxStatusBar* wxFrame::CreateStatusBar(int number, +wxStatusBar* wxFrameGTK::CreateStatusBar(int number, long style, wxWindowID id, const wxString& name) @@ -1140,7 +1166,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, return wxFrameBase::CreateStatusBar( number, style, id, name ); } -void wxFrame::PositionStatusBar() +void wxFrameGTK::PositionStatusBar() { if ( !m_frameStatusBar ) return; @@ -1153,7 +1179,7 @@ void wxFrame::PositionStatusBar() // frame title/icon // ---------------------------------------------------------------------------- -void wxFrame::SetTitle( const wxString &title ) +void wxFrameGTK::SetTitle( const wxString &title ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); @@ -1161,7 +1187,7 @@ void wxFrame::SetTitle( const wxString &title ) gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() ); } -void wxFrame::SetIcon( const wxIcon &icon ) +void wxFrameGTK::SetIcon( const wxIcon &icon ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); @@ -1184,12 +1210,12 @@ void wxFrame::SetIcon( const wxIcon &icon ) // frame state: maximized/iconized/normal // ---------------------------------------------------------------------------- -void wxFrame::Maximize(bool WXUNUSED(maximize)) +void wxFrameGTK::Maximize(bool WXUNUSED(maximize)) { wxFAIL_MSG( _T("not implemented") ); } -bool wxFrame::IsMaximized() const +bool wxFrameGTK::IsMaximized() const { // wxFAIL_MSG( _T("not implemented") ); @@ -1197,42 +1223,37 @@ bool wxFrame::IsMaximized() const return FALSE; } -void wxFrame::Restore() +void wxFrameGTK::Restore() { wxFAIL_MSG( _T("not implemented") ); } -void wxFrame::Iconize( bool iconize ) +void wxFrameGTK::Iconize( bool iconize ) { if (iconize) { - XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ), - GDK_WINDOW_XWINDOW( m_widget->window ), - DefaultScreen( GDK_DISPLAY() ) ); + GdkWindow *window = m_widget->window; + + // you should do it later, for example from OnCreate() handler + wxCHECK_RET( window, _T("frame not created yet - can't iconize") ); + + XIconifyWindow( GDK_WINDOW_XDISPLAY( window ), + GDK_WINDOW_XWINDOW( window ), + DefaultScreen( GDK_DISPLAY() ) ); } } -bool wxFrame::IsIconized() const +bool wxFrameGTK::IsIconized() const { return m_isIconized; } -void wxFrame::SetIconizeState(bool iconize) +void wxFrameGTK::SetIconizeState(bool iconize) { if ( iconize != m_isIconized ) { m_isIconized = iconize; (void)SendIconizeEvent(iconize); } - else - { - // this is not supposed to happen if we're called only from - // gtk_frame_(un)map_callback! - - // RR: I don't understand this test. Upon startup, the frame is - // not iconized by default, it has just not been created - // yet. - ///wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") ); - } }