#include "wx/control.h"
#include "wx/app.h"
#include "wx/dcclient.h"
+#include "wx/gtk/private.h"
#include <glib.h>
#include <gdk/gdk.h>
#include "wx/unix/utilsx11.h"
+// XA_CARDINAL
+#include <X11/Xatom.h>
+
// ----------------------------------------------------------------------------
// idle system
// ----------------------------------------------------------------------------
m_widget = gtk_window_new( win_type );
- if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)) &&
- (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG))
+ if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
+ (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
+ (style & wxFRAME_FLOAT_ON_PARENT)))
{
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_window_set_wmclass( GTK_WINDOW(m_widget), wxGTK_CONV( name ), wxGTK_CONV( name ) );
- gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
+ gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
{
if (m_grabbed)
{
- wxASSERT_MSG( FALSE, "Window still grabbed");
+ wxASSERT_MSG( FALSE, _T("Window still grabbed"));
RemoveGrab();
}
-
+
m_isBeingDeleted = TRUE;
// it may also be GtkScrolledWindow in the case of an MDI child
{
gtk_window_set_focus( GTK_WINDOW(m_widget), NULL );
}
+}
+
+
+// X11 ICCCM values for window layers
+#define WIN_LAYER_NORMAL 4
+#define WIN_LAYER_ABOVE_DOCK 10
- wxTopLevelWindows.DeleteObject( this );
+// X11 window manager property name
+#define XA_WIN_LAYER "_WIN_LAYER"
- if (wxTheApp->GetTopWindow() == this)
- wxTheApp->SetTopWindow( (wxWindow*) NULL );
+// 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;
- if ((wxTopLevelWindows.Number() == 0) &&
- (wxTheApp->GetExitOnFrameDelete()))
+ 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
{
- wxTheApp->ExitMainLoop();
+ 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;
if (show)
GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
- gtk_widget_hide( m_widget );
- gtk_widget_unrealize( m_widget );
+ int screen_width,screen_height;
+ wxDisplaySize( &screen_width, &screen_height );
- m_gdkDecor = (long) GDK_DECOR_BORDER;
- m_gdkFunc = (long) GDK_FUNC_MOVE;
+ gint client_x, client_y, root_x, root_y;
+ gint width, height;
+
+ 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);
- int x;
- int y;
- wxDisplaySize( &x, &y );
- SetSize( 0, 0, x, y );
+ wx_win_hints_set_layer( m_widget, WIN_LAYER_ABOVE_DOCK );
- gtk_widget_realize( m_widget );
- gtk_widget_show( m_widget );
+ gdk_window_move_resize (m_widget->window, -client_x, -client_y,
+ screen_width + 1, screen_height + 1);
}
else
{
- gtk_widget_hide( m_widget );
- gtk_widget_unrealize( m_widget );
-
- m_gdkFunc = m_fsSaveGdkFunc;
- m_gdkDecor = m_fsSaveGdkDecor;
+ wx_win_hints_set_layer( m_widget, WIN_LAYER_NORMAL );
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;
{
if (x != -1) m_x = x;
if (y != -1) m_y = y;
- if (width != -1) m_width = width;
- if (height != -1) m_height = height;
}
else
{
m_x = x;
m_y = y;
- m_width = width;
- m_height = height;
}
+ if (width != -1) m_width = width;
+ if (height != -1) m_height = height;
/*
if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
// Gtk-WARNING **: gtk_widget_size_allocate():
// attempt to allocate widget with width 65535 and height 600
// but I don't have time to track them all now..
- //
+ //
// Really we need to encapulate all this height/width business and
// stop any old method from ripping at the members directly and
// scattering -1's without regard for who might resolve them later.
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
m_title = title;
- gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
+ gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
}
void wxTopLevelWindowGTK::DoSetIcon( const wxIcon &icon )
// 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