// event tables
// ----------------------------------------------------------------------------
-#ifndef __WXUNIVERSAL__
- IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)
-#endif
-
// ----------------------------------------------------------------------------
// data
// ----------------------------------------------------------------------------
wxapp_install_idle_handler();
if (win->IsEnabled() &&
- (g_openDialogs == 0 || (win->GetExtraStyle() & wxTLW_EX_DIALOG)))
+ (g_openDialogs == 0 || (win->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)))
win->Close();
return TRUE;
//-----------------------------------------------------------------------------
static gint
-#if (GTK_MINOR_VERSION > 0)
gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxTopLevelWindowGTK *win )
-#else
-gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxTopLevelWindowGTK *win )
-#endif
{
if (g_isIdle)
wxapp_install_idle_handler();
if (!win->m_hasVMT)
return FALSE;
-#if (GTK_MINOR_VERSION > 0)
int x = 0;
int y = 0;
gdk_window_get_root_origin( win->m_widget->window, &x, &y );
win->m_x = x;
win->m_y = y;
-#else
- win->m_x = event->x;
- win->m_y = event->y;
-#endif
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win );
// "realize" from m_widget
//-----------------------------------------------------------------------------
-/* we cannot MWM hints and icons before the widget has been realized,
- so we do this directly after realization */
+// we cannot MWM hints and icons before the widget has been realized,
+// so we do this directly after realization
static void
gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxTopLevelWindowGTK *win )
if (g_isIdle)
wxapp_install_idle_handler();
- 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 );
- gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)0 );
- }
- else
- {
- /* All this is for Motif Window Manager "hints" and is supposed to be
- recognized by other WM as well. Not tested. */
- long decor = (long) GDK_DECOR_BORDER;
- long func = (long) GDK_FUNC_MOVE;
-
- if ((win->GetWindowStyle() & wxCAPTION) != 0)
- decor |= GDK_DECOR_TITLE;
- if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)
- {
- decor |= GDK_DECOR_MENU;
- func |= GDK_FUNC_CLOSE;
- }
- if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0)
- {
- func |= GDK_FUNC_MINIMIZE;
- decor |= GDK_DECOR_MINIMIZE;
- }
- if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)
- {
- func |= GDK_FUNC_MAXIMIZE;
- decor |= GDK_DECOR_MAXIMIZE;
- }
- if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 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);
- }
+ // All this is for Motif Window Manager "hints" and is supposed to be
+ // recognized by other WM as well. Not tested.
+ gdk_window_set_decorations(win->m_widget->window,
+ (GdkWMDecoration)win->m_gdkDecor);
+ gdk_window_set_functions(win->m_widget->window,
+ (GdkWMFunction)win->m_gdkFunc);
- /* GTK's shrinking/growing policy */
- if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)
+ // GTK's shrinking/growing policy
+ if ((win->m_gdkFunc & GDK_FUNC_RESIZE) == 0)
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
else
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
- /* reset the icon */
+ // reset the icon
wxIcon iconOld = win->GetIcon();
if ( iconOld != wxNullIcon )
{
win->SetIcon( icon );
}
- /* we set the focus to the child that accepts the focus. this
- doesn't really have to be done in "realize" but why not? */
+ // we set the focus to the child that accepts the focus. this
+ // doesn't really have to be done in "realize" but why not?
wxWindowList::Node *node = win->GetChildren().GetFirst();
while (node)
{
if (!parent->m_insertInClientArea)
{
- /* these are outside the client area */
+ // these are outside the client area
wxTopLevelWindowGTK* frame = (wxTopLevelWindowGTK*) parent;
gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget),
GTK_WIDGET(child->m_widget),
}
else
{
- /* these are inside the client area */
+ // these are inside the client area
gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
GTK_WIDGET(child->m_widget),
child->m_x,
child->m_height );
}
- /* resize on OnInternalIdle */
+ // resize on OnInternalIdle
parent->GtkUpdateSize();
}
m_isIconized = FALSE;
m_fsIsShowing = FALSE;
m_themeEnabled = TRUE;
+ m_gdkDecor = m_gdkFunc = 0;
}
bool wxTopLevelWindowGTK::Create( wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& sizeOrig,
- long style,
- const wxString &name )
+ wxWindowID id,
+ 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)
if (style & wxFRAME_TOOL_WINDOW)
win_type = GTK_WINDOW_POPUP;
-
- if (GetExtraStyle() & wxTLW_EX_DIALOG)
+
+ if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
win_type = GTK_WINDOW_DIALOG;
m_widget = gtk_window_new( win_type );
- if ((m_parent) && (HasFlag(wxFRAME_FLOAT_ON_PARENT)) && (GTK_IS_WINDOW(m_parent->m_widget)))
+ if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)) &&
+ (HasFlag(wxFRAME_FLOAT_ON_PARENT) || (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)))
+ {
gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
+ }
if (!name.IsEmpty())
gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
- /* m_mainWidget holds the toolbar, the menubar and the client area */
+ // m_mainWidget holds the toolbar, the menubar and the client area
m_mainWidget = gtk_pizza_new();
gtk_widget_show( m_mainWidget );
GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
- /* for m_mainWidget themes */
+ // 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",
debug_focus_in( m_mainWidget, wxT("wxTopLevelWindowGTK::m_mainWidget"), name );
#endif
- /* m_wxwindow only represents the client area without toolbar and menubar */
+ // m_wxwindow only represents the client area without toolbar and menubar
m_wxwindow = gtk_pizza_new();
gtk_widget_show( m_wxwindow );
gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
debug_focus_in( m_wxwindow, wxT("wxTopLevelWindowGTK::m_wxwindow"), name );
#endif
- /* we donm't allow the frame to get the focus as otherwise
- the frame will grab it at arbitrary focus changes. */
+ // we donm't allow the frame to get the focus as otherwise
+ // 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 );
- /* the user resized the frame by dragging etc. */
+ // the user resized the frame by dragging etc.
gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)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 );
+
+ gtk_window_set_default_size( GTK_WINDOW(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 */
+ // 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_FUNC(gtk_frame_realized_callback), (gpointer) this );
- /* the only way to get the window size is to connect to this event */
+ // 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 );
- /* map and unmap for iconized state */
+ // 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 */
+ // 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 */
+ // disable native tab traversal
gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
GTK_SIGNAL_FUNC(gtk_frame_focus_callback), (gpointer)this );
+ // decorations
+ if ((m_miniEdge > 0) || (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))
+ {
+ m_gdkDecor = 0;
+ m_gdkFunc = 0;
+ }
+ else
+ {
+ m_gdkDecor = (long) GDK_DECOR_BORDER;
+ m_gdkFunc = (long) GDK_FUNC_MOVE;
+
+ // All this is for Motif Window Manager "hints" and is supposed to be
+ // recognized by other WMs as well.
+ if ((style & wxCAPTION) != 0)
+ m_gdkDecor |= GDK_DECOR_TITLE;
+ if ((style & wxSYSTEM_MENU) != 0)
+ {
+ m_gdkFunc |= GDK_FUNC_CLOSE;
+ m_gdkDecor |= GDK_DECOR_MENU;
+ }
+ if ((style & wxMINIMIZE_BOX) != 0)
+ {
+ m_gdkFunc |= GDK_FUNC_MINIMIZE;
+ m_gdkDecor |= GDK_DECOR_MINIMIZE;
+ }
+ if ((style & wxMAXIMIZE_BOX) != 0)
+ {
+ m_gdkFunc |= GDK_FUNC_MAXIMIZE;
+ m_gdkDecor |= GDK_DECOR_MAXIMIZE;
+ }
+ if ((style & wxRESIZE_BORDER) != 0)
+ {
+ m_gdkFunc |= GDK_FUNC_RESIZE;
+ m_gdkDecor |= GDK_DECOR_RESIZEH;
+ }
+ }
+
return TRUE;
}
wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
{
m_isBeingDeleted = TRUE;
+
+ gtk_window_set_focus( GTK_WINDOW(m_widget), NULL );
wxTopLevelWindows.DeleteObject( this );
if (show)
{
- m_fsSaveStyle = m_windowStyle;
+ m_fsSaveGdkFunc = m_gdkFunc;
+ m_fsSaveGdkDecor = m_gdkDecor;
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;
+ m_gdkDecor = (long) GDK_DECOR_BORDER;
+ m_gdkFunc = (long) GDK_FUNC_MOVE;
int x;
int y;
gtk_widget_hide( m_widget );
gtk_widget_unrealize( m_widget );
- m_windowStyle = m_fsSaveStyle;
+ m_gdkFunc = m_fsSaveGdkFunc;
+ m_gdkDecor = m_fsSaveGdkDecor;
SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height );
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- /* this shouldn't happen: wxFrameGTK, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+ // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
- /* avoid recursions */
+ // avoid recursions
if (m_resizing)
return;
m_resizing = TRUE;
if ((m_width != old_width) || (m_height != old_height))
{
- gtk_widget_set_usize( m_widget, m_width, m_height );
+ if (m_widget->window)
+ gdk_window_resize( m_widget->window, m_width, m_height );
+ else
+ gtk_window_set_default_size( GTK_WINDOW(m_widget), m_width, m_height );
/* we set the size in GtkOnSize, i.e. mostly the actual resizing is
done either directly before the frame is shown or in idle time
wxWindow::DoGetClientSize( width, height );
if (height)
{
- /* mini edge */
+ // mini edge
*height -= m_miniEdge*2 + m_miniTitle;
}
if (width)
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- DoSetSize(-1, -1,
+ DoSetSize(-1, -1,
width + m_miniEdge*2, height + m_miniEdge*2 + m_miniTitle, 0);
}
void wxTopLevelWindowGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
- int width, int height )
+ int width, int height )
{
// due to a bug in gtk, x,y are always 0
// m_x = x;
// m_y = y;
- /* avoid recursions */
+ // avoid recursions
if (m_resizing) return;
m_resizing = TRUE;
m_width = width;
m_height = height;
- /* wxMDIChildFrame derives from wxFrameGTK but it _is_ a wxWindow as it uses
+ /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
- set in wxFrameGTK::Create so it is used to check what kind of frame we
+ set in wxFrame::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 */
if (m_mainWidget)
{
- /* set size hints */
+ // 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;
}
else
{
- /* if there is no m_mainWidget between m_widget and m_wxwindow there
- is no need to set the size or position of m_wxwindow. */
+ // If there is no m_mainWidget between m_widget and m_wxwindow there
+ // is no need to set the size or position of m_wxwindow.
}
m_sizeSet = TRUE;
projects / wxWidgets.git / blobdiff