X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f3c610d03848f7953b52f66d6ba5aa1719b8cc2..f80eabe5a2a9922c2c73d44b4037a2de8fffdf87:/src/gtk/frame.cpp?ds=sidebyside diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index f4e2970ad0..71d58cae4d 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; @@ -242,13 +246,13 @@ gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *ev /* we cannot MWM hints and icons before the widget has been realized, so we do this directly after realization */ -static gint -gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) +static void +gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); - if ((win->m_miniEdge > 0) || (win->HasFlag(wxSIMPLE_BORDER))) + if ((win->m_miniEdge > 0) || (win->HasFlag(wxSIMPLE_BORDER)) || (win->HasFlag(wxNO_BORDER))) { /* This is a mini-frame or a borderless frame. */ gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)0 ); @@ -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); } @@ -317,8 +321,57 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) node = node->GetNext(); } +} - return FALSE; +//----------------------------------------------------------------------------- +// "map_event" from m_widget +//----------------------------------------------------------------------------- + +static void +gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), + GdkEvent * WXUNUSED(event), + wxFrame *win ) +{ + win->m_isIconized = FALSE; +} + +//----------------------------------------------------------------------------- +// "unmap_event" from m_widget +//----------------------------------------------------------------------------- + +static void +gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget), + GdkEvent * WXUNUSED(event), + wxFrame *win ) +{ + win->m_isIconized = TRUE; +} + +//----------------------------------------------------------------------------- +// "expose_event" of m_client +//----------------------------------------------------------------------------- + +static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win ) +{ + GtkPizza *pizza = GTK_PIZZA(widget); + + gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, + GTK_SHADOW_NONE, &gdk_event->area, win->m_widget, "base", 0, 0, -1, -1); + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "draw" of m_client +//----------------------------------------------------------------------------- + + +static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win ) +{ + GtkPizza *pizza = GTK_PIZZA(widget); + + gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL, + GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1); } // ---------------------------------------------------------------------------- @@ -394,21 +447,35 @@ void wxFrame::Init() m_menuBarDetached = FALSE; m_toolBarDetached = FALSE; m_insertInClientArea = TRUE; - m_isFrame = FALSE; + m_isFrame = TRUE; + m_isIconized = FALSE; + m_fsIsShowing = FALSE; + m_themeEnabled = TRUE; } bool wxFrame::Create( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos, - const wxSize &size, + const wxString& title, + const wxPoint& pos, + const wxSize& sizeOrig, long style, const wxString &name ) { + // always create a frame of some reasonable, even if arbitrary, size (at + // least for MSW compatibility) + wxSize size = sizeOrig; + if ( size.x == -1 || size.y == -1 ) + { + wxSize sizeDpy = wxGetDisplaySize(); + if ( size.x == -1 ) + size.x = sizeDpy.x / 3; + if ( size.y == -1 ) + size.y = sizeDpy.y / 5; + } + wxTopLevelWindows.Append( this ); m_needParent = FALSE; - m_isFrame = TRUE; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) @@ -422,6 +489,9 @@ bool wxFrame::Create( wxWindow *parent, m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; + + if (style & wxFRAME_TOOL_WINDOW) + win_type = GTK_WINDOW_POPUP; m_widget = gtk_window_new( win_type ); @@ -447,6 +517,12 @@ bool wxFrame::Create( wxWindow *parent, GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS ); gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget ); + /* for m_mainWidget themes */ + gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event", + GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this ); + gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw", + GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); + #ifdef __WXDEBUG__ debug_focus_in( m_mainWidget, wxT("wxFrame::m_mainWidget"), name ); #endif @@ -475,7 +551,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", @@ -485,6 +561,16 @@ bool wxFrame::Create( wxWindow *parent, gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this ); + /* map and unmap for iconized state */ + gtk_signal_connect( GTK_OBJECT(m_widget), "map_event", + GTK_SIGNAL_FUNC(gtk_frame_map_callback), (gpointer)this ); + gtk_signal_connect( GTK_OBJECT(m_widget), "unmap_event", + GTK_SIGNAL_FUNC(gtk_frame_unmap_callback), (gpointer)this ); + + /* the only way to get the window size is to connect to this event */ + gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", + GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this ); + /* disable native tab traversal */ gtk_signal_connect( GTK_OBJECT(m_widget), "focus", GTK_SIGNAL_FUNC(gtk_frame_focus_callback), (gpointer)this ); @@ -510,6 +596,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 // ---------------------------------------------------------------------------- @@ -535,7 +663,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") ); @@ -625,12 +753,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) { @@ -676,12 +804,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) { @@ -738,23 +866,22 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), 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 ); if (m_mainWidget) { + /* 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 @@ -780,7 +907,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; @@ -836,7 +963,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; @@ -926,7 +1053,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 ); @@ -971,9 +1098,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; @@ -1057,20 +1181,25 @@ void wxFrame::SetIcon( const wxIcon &icon ) } // ---------------------------------------------------------------------------- -// frame state: maximized/iconized/normal (TODO) +// frame state: maximized/iconized/normal // ---------------------------------------------------------------------------- void wxFrame::Maximize(bool WXUNUSED(maximize)) { + wxFAIL_MSG( _T("not implemented") ); } bool wxFrame::IsMaximized() const { + // wxFAIL_MSG( _T("not implemented") ); + + // This is an approximation return FALSE; } void wxFrame::Restore() { + wxFAIL_MSG( _T("not implemented") ); } void wxFrame::Iconize( bool iconize ) @@ -1085,5 +1214,5 @@ void wxFrame::Iconize( bool iconize ) bool wxFrame::IsIconized() const { - return FALSE; + return m_isIconized; }