X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84eacd3032dab426f4163afc6ae87cc422391a0e..87df17a11b0017d31c09f767bd921abb27193bee:/src/gtk1/frame.cpp diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 23b5ea9c9f..97e19ac404 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -246,7 +246,7 @@ 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 +static void gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win ) { if (g_isIdle) @@ -321,8 +321,57 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(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->SetIconizeState(FALSE); +} + +//----------------------------------------------------------------------------- +// "unmap_event" from m_widget +//----------------------------------------------------------------------------- + +static void +gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget), + GdkEvent * WXUNUSED(event), + wxFrame *win ) +{ + win->SetIconizeState(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); } // ---------------------------------------------------------------------------- @@ -398,20 +447,35 @@ void wxFrame::Init() m_menuBarDetached = FALSE; m_toolBarDetached = FALSE; m_insertInClientArea = TRUE; + 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_fsIsShowing = FALSE; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) @@ -426,6 +490,9 @@ bool wxFrame::Create( wxWindow *parent, GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; + if (style & wxFRAME_TOOL_WINDOW) + win_type = GTK_WINDOW_POPUP; + m_widget = gtk_window_new( win_type ); if ((m_parent) && (HasFlag(wxFRAME_FLOAT_ON_PARENT)) && (GTK_IS_WINDOW(m_parent->m_widget))) @@ -450,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 @@ -464,7 +537,7 @@ bool wxFrame::Create( wxWindow *parent, #endif /* we donm't allow the frame to get the focus as otherwise - the frame will grabit at arbitrary fcous changes. */ + the frame will grab it at arbitrary focus changes. */ GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); if (m_parent) m_parent->AddChild( this ); @@ -488,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 ); @@ -518,24 +601,24 @@ 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 ); } @@ -543,15 +626,15 @@ bool wxFrame::ShowFullScreen(bool show, long style ) { 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; } @@ -1098,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 ) @@ -1126,5 +1214,25 @@ void wxFrame::Iconize( bool iconize ) bool wxFrame::IsIconized() const { - return FALSE; + return m_isIconized; } + +void wxFrame::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") ); + } +} +