X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15909a16b313e09d05f40fc9b95b414d7c83bac1..26a80c224659f74a47fa2ee708d4440b8518a6d8:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 04d2407999..a8f5c7644d 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -19,6 +19,10 @@ #pragma implementation "frame.h" #endif +#ifdef __VMS +#define XIconifyWindow XICONIFYWINDOW +#endif + #include "wx/frame.h" #include "wx/dialog.h" #include "wx/control.h" @@ -216,7 +220,7 @@ gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *ev if (!win->m_hasVMT) return FALSE; - + #if (GTK_MINOR_VERSION > 0) int x = 0; int y = 0; @@ -243,7 +247,7 @@ gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *ev so we do this directly after realization */ static gint -gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) +gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -283,7 +287,7 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) func |= GDK_FUNC_RESIZE; decor |= GDK_DECOR_RESIZEH; } - + gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor); gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func); } @@ -294,19 +298,6 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) else gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1); - /* set size hints */ - gint flag = 0; // GDK_HINT_POS; - if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE; - if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE; - if (flag) - { - gdk_window_set_hints( win->m_widget->window, - win->m_x, win->m_y, - win->GetMinWidth(), win->GetMinHeight(), - win->GetMaxWidth(), win->GetMaxHeight(), - flag ); - } - /* reset the icon */ wxIcon iconOld = win->GetIcon(); if ( iconOld != wxNullIcon ) @@ -407,7 +398,6 @@ void wxFrame::Init() m_menuBarDetached = FALSE; m_toolBarDetached = FALSE; m_insertInClientArea = TRUE; - m_isFrame = FALSE; } bool wxFrame::Create( wxWindow *parent, @@ -421,7 +411,7 @@ bool wxFrame::Create( wxWindow *parent, wxTopLevelWindows.Append( this ); m_needParent = FALSE; - m_isFrame = TRUE; + m_fsIsShowing = FALSE; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) @@ -488,7 +478,7 @@ bool wxFrame::Create( wxWindow *parent, if ((m_x != -1) || (m_y != -1)) gtk_widget_set_uposition( m_widget, m_x, m_y ); gtk_widget_set_usize( m_widget, m_width, m_height ); - + /* we cannot set MWM hints and icons before the widget has been realized, so we do this directly after realization */ gtk_signal_connect( GTK_OBJECT(m_widget), "realize", @@ -523,6 +513,48 @@ wxFrame::~wxFrame() } } +bool wxFrame::ShowFullScreen(bool show, long style ) +{ + if (show == m_fsIsShowing) return FALSE; // return what? + + m_fsIsShowing = show; + + if (show) + { + m_fsSaveStyle = m_windowStyle; + m_fsSaveFlag = style; + GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y ); + GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height ); + + gtk_widget_hide( m_widget ); + gtk_widget_unrealize( m_widget ); + + m_windowStyle = wxSIMPLE_BORDER; + + int x; + int y; + wxDisplaySize( &x, &y ); + SetSize( 0, 0, x, y ); + + gtk_widget_realize( m_widget ); + gtk_widget_show( m_widget ); + } + else + { + gtk_widget_hide( m_widget ); + gtk_widget_unrealize( m_widget ); + + m_windowStyle = m_fsSaveStyle; + + SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height ); + + gtk_widget_realize( m_widget ); + gtk_widget_show( m_widget ); + } + + return TRUE; +} + // ---------------------------------------------------------------------------- // overridden wxWindow methods // ---------------------------------------------------------------------------- @@ -548,7 +580,7 @@ void wxFrame::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width) { wxFAIL_MSG( wxT("DoMoveWindow called for wxFrame") ); } - + void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); @@ -638,12 +670,12 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const #if wxUSE_STATUSBAR /* status bar */ - if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; + if (m_frameStatusBar && m_frameStatusBar->IsShown()) (*height) -= wxSTATUS_HEIGHT; #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR /* tool bar */ - if (m_frameToolBar) + if (m_frameToolBar && m_frameToolBar->IsShown()) { if (m_toolBarDetached) { @@ -689,12 +721,12 @@ void wxFrame::DoSetClientSize( int width, int height ) #if wxUSE_STATUSBAR /* status bar */ - if (m_frameStatusBar) height += wxSTATUS_HEIGHT; + if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT; #endif #if wxUSE_TOOLBAR /* tool bar */ - if (m_frameToolBar) + if (m_frameToolBar && m_frameToolBar->IsShown()) { if (m_toolBarDetached) { @@ -747,13 +779,26 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), skip the part which handles m_frameMenuBar, m_frameToolBar and (most importantly) m_mainWidget */ + 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_maxWidth; + if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; + if (m_mainWidget) { - /* check if size is in legal range */ - 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_maxWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; + /* set size hints */ + gint flag = 0; // GDK_HINT_POS; + if ((m_minWidth != -1) || (m_minHeight != -1)) flag |= GDK_HINT_MIN_SIZE; + if ((m_maxWidth != -1) || (m_maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE; + GdkGeometry geom; + geom.min_width = m_minWidth; + geom.min_height = m_minHeight; + geom.max_width = m_maxWidth; + geom.max_height = m_maxHeight; + gtk_window_set_geometry_hints( GTK_WINDOW(m_widget), + (GtkWidget*) NULL, + &geom, + (GdkWindowHints) flag ); /* I revert back to wxGTK's original behaviour. m_mainWidget holds the * menubar, the toolbar and the client area, which is represented by @@ -779,7 +824,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), } #if wxUSE_TOOLBAR - if ((m_frameToolBar) && + if ((m_frameToolBar) && m_frameToolBar->IsShown() && (m_frameToolBar->m_widget->parent == m_mainWidget)) { int xx = m_miniEdge; @@ -835,7 +880,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), } #if wxUSE_STATUSBAR - if (m_frameStatusBar) + if (m_frameStatusBar && m_frameStatusBar->IsShown()) { int xx = 0 + m_miniEdge; int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; @@ -852,9 +897,6 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), } #endif - /* we actually set the size of a frame here and no-where else */ -// gtk_widget_set_usize( m_widget, m_width, m_height ); - m_sizeSet = TRUE; // send size event to frame @@ -928,7 +970,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar ) gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget), GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); } - + gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); gtk_widget_ref( m_frameMenuBar->m_widget ); gtk_widget_unparent( m_frameMenuBar->m_widget ); @@ -973,9 +1015,6 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name ); - if (m_frameToolBar) - GetChildren().DeleteObject( m_frameToolBar ); - m_insertInClientArea = TRUE; m_sizeSet = FALSE;