#include "wx/defs.h"
+#include "wx/log.h"
#include "wx/dialog.h"
#include "wx/control.h"
#include "wx/app.h"
#include "wx/dcclient.h"
#include "wx/gtk/private.h"
+#include "wx/timer.h"
#include <glib.h>
#include <gdk/gdk.h>
(char *)"base",
0, 0, -1, -1);
- return TRUE;
+ return FALSE;
}
//-----------------------------------------------------------------------------
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",
+ if (m_miniEdge == 0) // wxMiniFrame has its own version.
+ {
+ // For m_mainWidget themes
+ gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
#ifndef __WXGTK20__
- gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
+ gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
#endif
+ }
// m_wxwindow only represents the client area without toolbar and menubar
m_wxwindow = gtk_pizza_new();
}
-// X11 ICCCM values for window layers
-#define WIN_LAYER_NORMAL 4
-#define WIN_LAYER_ABOVE_DOCK 10
-
-// X11 window manager property name
-#define XA_WIN_LAYER "_WIN_LAYER"
-
-// X11 window manager property name atom
-static Atom gs_XA_WIN_LAYER = 0;
-
-
-static void wx_win_hints_set_layer(GtkWidget *window, int layer)
-{
-#ifndef __WXGTK20__
- XEvent xev;
- GdkWindowPrivate *priv;
- gint prev_error;
-
- prev_error = gdk_error_warnings;
- gdk_error_warnings = 0;
- priv = (GdkWindowPrivate*)(GTK_WIDGET(window)->window);
-
- if (GTK_WIDGET_MAPPED(window))
- {
- xev.type = ClientMessage;
- xev.xclient.type = ClientMessage;
- xev.xclient.window = priv->xwindow;
- xev.xclient.message_type = gs_XA_WIN_LAYER;
- xev.xclient.format = 32;
- xev.xclient.data.l[0] = (long)layer;
- xev.xclient.data.l[1] = gdk_time_get();
-
- XSendEvent(GDK_DISPLAY(), GDK_ROOT_WINDOW(), False,
- SubstructureNotifyMask, (XEvent*) &xev);
- }
- else
- {
- long data[1];
-
- data[0] = layer;
- XChangeProperty(GDK_DISPLAY(), priv->xwindow, gs_XA_WIN_LAYER,
- XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
- }
- gdk_error_warnings = prev_error;
-#endif
-}
bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
{
if (show == m_fsIsShowing) return FALSE; // return what?
- if (gs_XA_WIN_LAYER == 0)
- {
- // Initialose X11 Atom only once
- gs_XA_WIN_LAYER = XInternAtom( GDK_DISPLAY(), XA_WIN_LAYER, False );
- }
-
m_fsIsShowing = show;
+ GdkWindow *window = m_widget->window;
+ wxX11FullScreenMethod method =
+ wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
+ (WXWindow)GDK_ROOT_WINDOW());
+
if (show)
{
- 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 );
gint client_x, client_y, root_x, root_y;
gint width, height;
+ if (method == wxX11_FS_GENERIC)
+ {
+ // don't do it always, Metacity hates it
+ m_fsSaveGdkFunc = m_gdkFunc;
+ m_fsSaveGdkDecor = m_gdkDecor;
+ m_gdkFunc = m_gdkDecor = 0;
+ gdk_window_set_decorations(window, (GdkWMDecoration)0);
+ gdk_window_set_functions(window, (GdkWMFunction)0);
+ }
+
gdk_window_get_origin (m_widget->window, &root_x, &root_y);
gdk_window_get_geometry (m_widget->window, &client_x, &client_y,
&width, &height, NULL);
- wx_win_hints_set_layer( m_widget, WIN_LAYER_ABOVE_DOCK );
-
gdk_window_move_resize (m_widget->window, -client_x, -client_y,
screen_width + 1, screen_height + 1);
+
+ wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
+ (WXWindow)GDK_ROOT_WINDOW(),
+ (WXWindow)GDK_WINDOW_XWINDOW(window),
+ show, &m_fsSaveFrame, method);
}
else
{
- wx_win_hints_set_layer( m_widget, WIN_LAYER_NORMAL );
-
- SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height );
+ if (method == wxX11_FS_GENERIC)
+ {
+ // don't do it always, Metacity hates it
+ m_gdkFunc = m_fsSaveGdkFunc;
+ m_gdkDecor = m_fsSaveGdkDecor;
+ gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
+ gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
+ }
+
+ wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
+ (WXWindow)GDK_ROOT_WINDOW(),
+ (WXWindow)GDK_WINDOW_XWINDOW(window),
+ show, &m_fsSaveFrame, method);
+
+ SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
+ m_fsSaveFrame.width, m_fsSaveFrame.height);
}
+
return TRUE;
}
if ( g_delayedFocus &&
wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this )
{
+ wxLogTrace(_T("focus"),
+ _T("Setting focus from wxTLW::OnIdle() to %s(%s)"),
+ g_delayedFocus->GetClassInfo()->GetClassName(),
+ g_delayedFocus->GetLabel().c_str());
+
g_delayedFocus->SetFocus();
g_delayedFocus = NULL;
}
// frame state: maximized/iconized/normal
// ----------------------------------------------------------------------------
-void wxTopLevelWindowGTK::Maximize(bool WXUNUSED(maximize))
+void wxTopLevelWindowGTK::Maximize(bool maximize)
{
+#ifdef __WXGTK20__
+ if (maximize)
+ gtk_window_maximize( GTK_WINDOW( m_widget ) );
+ else
+ gtk_window_unmaximize( GTK_WINDOW( m_widget ) );
+#else
wxFAIL_MSG( _T("not implemented") );
+#endif
}
bool wxTopLevelWindowGTK::IsMaximized() const
void wxTopLevelWindowGTK::Restore()
{
+#ifdef __GTK20__
+ // "Present" seems similar enough to "restore"
+ gtk_window_present( GTK_WINDOW( m_widget ) );
+#else
wxFAIL_MSG( _T("not implemented") );
+#endif
}
void wxTopLevelWindowGTK::Iconize( bool iconize )
{
+#ifdef __WXGTK20__
+ if (iconize)
+ gtk_window_iconify( GTK_WINDOW( m_widget ) );
+ else
+ gtk_window_deiconify( GTK_WINDOW( m_widget ) );
+#else
if (iconize)
{
GdkWindow *window = m_widget->window;
GDK_WINDOW_XWINDOW( window ),
DefaultScreen( GDK_DISPLAY() ) );
}
+#endif
}
bool wxTopLevelWindowGTK::IsIconized() const
projects / wxWidgets.git / blobdiff