#pragma implementation "frame.h"
#endif
+#ifdef __VMS
+#define XIconifyWindow XICONIFYWINDOW
+#endif
+
#include "wx/frame.h"
#include "wx/dialog.h"
#include "wx/control.h"
if (!win->m_hasVMT)
return FALSE;
-
+
#if (GTK_MINOR_VERSION > 0)
int x = 0;
int y = 0;
/* 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 );
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);
}
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 )
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);
}
// ----------------------------------------------------------------------------
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 ))
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)))
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
#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 );
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",
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 );
}
}
+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
// ----------------------------------------------------------------------------
{
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") );
#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)
{
#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)
{
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
}
#if wxUSE_TOOLBAR
- if ((m_frameToolBar) &&
+ if ((m_frameToolBar) && m_frameToolBar->IsShown() &&
(m_frameToolBar->m_widget->parent == m_mainWidget))
{
int xx = m_miniEdge;
}
#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;
}
#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
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 );
m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
- if (m_frameToolBar)
- GetChildren().DeleteObject( m_frameToolBar );
-
m_insertInClientArea = TRUE;
m_sizeSet = FALSE;
}
// ----------------------------------------------------------------------------
-// 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 )
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") );
+ }
+}
+
projects / wxWidgets.git / blobdiff