#include "wx/sysopt.h"
#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
+#endif
#include "wx/gtk/private/win_gtk.h"
+#ifdef GDK_WINDOWING_X11
+
#include "wx/unix/utilsx11.h"
// XA_CARDINAL
#include <X11/Xatom.h>
+#endif // GDK_WINDOWING_X11
+
#if wxUSE_LIBHILDON
#include <hildon-widgets/hildon-program.h>
#include <hildon-widgets/hildon-window.h>
else
#endif
{
+#ifdef GDK_WINDOWING_X11
GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(win));
wxCHECK_RET(window, "wxgtk_window_set_urgency_hint: GdkWindow not realized");
XSetWMHints(dpy, xid, wm_hints);
XFree(wm_hints);
+#endif // GDK_WINDOWING_X11
}
}
#define gtk_window_set_urgency_hint wxgtk_window_set_urgency_hint
GdkEventFocus *WXUNUSED(gdk_event),
wxTopLevelWindowGTK * WXUNUSED(win))
{
- // if the focus goes out of our app alltogether, OnIdle() will send
+ // if the focus goes out of our app altogether, OnIdle() will send
// wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
// g_sendActivateEvent to -1
g_sendActivateEvent = 0;
}
}
-// ----------------------------------------------------------------------------
-// "size_request"
-// ----------------------------------------------------------------------------
-
-extern "C" {
-static
-void wxgtk_tlw_size_request_callback(GtkWidget * WXUNUSED(widget),
- GtkRequisition *requisition,
- wxTopLevelWindowGTK *win)
-{
- // we must return the size of the window without WM decorations, otherwise
- // GTK+ gets confused, so don't call just GetSize() here
- win->GTKDoGetSize(&requisition->width, &requisition->height);
-}
-}
-
//-----------------------------------------------------------------------------
// "delete_event"
//-----------------------------------------------------------------------------
bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
{
+#ifdef GDK_WINDOWING_X11
static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
Atom xproperty = gdk_x11_atom_to_xatom_for_display(
gdk_drawable_get_display(window), property);
if (data)
XFree(data);
return success;
+#else
+ return false;
+#endif
}
//-----------------------------------------------------------------------------
g_signal_connect(m_wxwindow, "size_allocate",
G_CALLBACK(size_allocate), this);
- g_signal_connect (m_widget, "size_request",
- G_CALLBACK (wxgtk_tlw_size_request_callback), this);
PostCreation();
#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
}
}
+ // GTK sometimes chooses very small size if max size hint is not explicitly set
+ int maxWidth = m_maxWidth;
+ int maxHeight = m_maxHeight;
+ if (maxWidth < 0)
+ maxWidth = INT_MAX;
+ if (maxHeight < 0)
+ maxHeight = INT_MAX;
+ DoSetSizeHints(m_minWidth, m_minHeight, maxWidth, maxHeight, -1, -1);
+
m_decorSize = GetCachedDecorSize();
int w, h;
GTKDoGetSize(&w, &h);
m_fsIsShowing = show;
+#ifdef GDK_WINDOWING_X11
wxX11FullScreenMethod method =
wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW());
// check if WM supports the spec and use legacy methods if it
// doesn't.
if ( method == wxX11_FS_WMSPEC )
+#endif // GDK_WINDOWING_X11
{
if (show)
gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
else
gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
}
+#ifdef GDK_WINDOWING_X11
else
{
GdkWindow* window = gtk_widget_get_window(m_widget);
m_fsSaveFrame.width, m_fsSaveFrame.height);
}
}
+#endif // GDK_WINDOWING_X11
// documented behaviour is to show the window if it's still hidden when
// showing it full screen
GdkScreen* screen = NULL;
if (deferShow)
{
+#ifdef GDK_WINDOWING_X11
screen = gtk_widget_get_screen(m_widget);
GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false);
deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0;
+#else
+ deferShow = false;
+#endif
// If _NET_REQUEST_FRAME_EXTENTS not supported, don't allow changes
// to m_decorSize, it breaks saving/restoring window size with
// GetSize()/SetSize() because it makes window bigger between each
gtk_widget_set_allocation(m_widget, &alloc);
}
+#ifdef GDK_WINDOWING_X11
// send _NET_REQUEST_FRAME_EXTENTS
XClientMessageEvent xevent;
memset(&xevent, 0, sizeof(xevent));
XSendEvent(display, DefaultRootWindow(display), false,
SubstructureNotifyMask | SubstructureRedirectMask,
(XEvent*)&xevent);
+#endif // GDK_WINDOWING_X11
if (gs_requestFrameExtentsStatus == 0)
{
bool wxTopLevelWindowGTK::IsMaximized() const
{
- GdkWindow* window = gtk_widget_get_window(m_widget);
+ GdkWindow* window = NULL;
+ if (m_widget)
+ window = gtk_widget_get_window(m_widget);
return window && (gdk_window_get_state(window) & GDK_WINDOW_STATE_MAXIMIZED);
}
}
}
-/* Get the X Window between child and the root window.
- This should usually be the WM managed XID */
-static Window wxGetTopmostWindowX11(Display *dpy, Window child)
-{
- Window root, parent;
- Window* children;
- unsigned int nchildren;
-
- XQueryTree(dpy, child, &root, &parent, &children, &nchildren);
- XFree(children);
-
- while (parent != root) {
- child = parent;
- XQueryTree(dpy, child, &root, &parent, &children, &nchildren);
- XFree(children);
- }
-
- return child;
-}
-
bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha)
{
GdkWindow* window = NULL;
if (window == NULL)
return false;
+#ifdef GDK_WINDOWING_X11
Display* dpy = GDK_WINDOW_XDISPLAY(window);
- // We need to get the X Window that has the root window as the immediate parent
- // and m_widget->window as a child. This should be the X Window that the WM manages and
- // from which the opacity property is checked from.
- Window win = wxGetTopmostWindowX11(dpy, GDK_WINDOW_XID(window));
-
+ Window win = GDK_WINDOW_XID(window);
// Using pure Xlib to not have a GTK version check mess due to gtk2.0 not having GdkDisplay
if (alpha == 0xff)
}
XSync(dpy, False);
return true;
+#else // !GDK_WINDOWING_X11
+ return false;
+#endif // GDK_WINDOWING_X11 / !GDK_WINDOWING_X11
}
bool wxTopLevelWindowGTK::CanSetTransparent()
#if GTK_CHECK_VERSION(2,10,0)
if (!gtk_check_version(2,10,0))
{
- return (gtk_widget_is_composited (m_widget));
+ return gtk_widget_is_composited(m_widget) != 0;
}
else
#endif // In case of lower versions than gtk+-2.10.0 we could look for _NET_WM_CM_Sn ourselves
projects / wxWidgets.git / blobdiff