Commit 428c076f authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Delete EWMH properties if no private->state flags are set. (#66754)


	* gdk/x11/gdkwindow-x11.c (set_initial_hints): Delete EWMH
	properties if no private->state flags are set.  (#66754)

	* gtk/gtkwidget.c (gtk_widget_class_find_style_property):
	* gtk/gtkcontainer.c (gtk_container_class_find_child_property):
	Doc typo fixes.

	* gtk/tmpl/gtktextview.sgml: Add docs.

	* gtk/tree_widget.sgml: Fix some links.

	* gtk/tmpl/gtkwindow.sgml: Add docs.

	* gtk/tmpl/gtkeditable.sgml: Document GtkEditable as an interface,
	not as an abstract base class.

	* gtk/gtk-docs.sgml: Move GtkEditable from "Abstract Base Classes"
	to "Numeric/Text Data Entry".
parent 14ee65b6
2002-12-11 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkwindow-x11.c (set_initial_hints): Delete EWMH
properties if no private->state flags are set. (#66754)
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c (gtk_widget_class_find_style_property):
* gtk/gtkcontainer.c (gtk_container_class_find_child_property):
Doc typo fixes.
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
......
2002-12-11 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkwindow-x11.c (set_initial_hints): Delete EWMH
properties if no private->state flags are set. (#66754)
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c (gtk_widget_class_find_style_property):
* gtk/gtkcontainer.c (gtk_container_class_find_child_property):
Doc typo fixes.
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
......
2002-12-11 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkwindow-x11.c (set_initial_hints): Delete EWMH
properties if no private->state flags are set. (#66754)
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c (gtk_widget_class_find_style_property):
* gtk/gtkcontainer.c (gtk_container_class_find_child_property):
Doc typo fixes.
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
......
2002-12-11 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkwindow-x11.c (set_initial_hints): Delete EWMH
properties if no private->state flags are set. (#66754)
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c (gtk_widget_class_find_style_property):
* gtk/gtkcontainer.c (gtk_container_class_find_child_property):
Doc typo fixes.
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
......
2002-12-11 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkwindow-x11.c (set_initial_hints): Delete EWMH
properties if no private->state flags are set. (#66754)
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c (gtk_widget_class_find_style_property):
* gtk/gtkcontainer.c (gtk_container_class_find_child_property):
Doc typo fixes.
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
......
2002-12-11 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkwindow-x11.c (set_initial_hints): Delete EWMH
properties if no private->state flags are set. (#66754)
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c (gtk_widget_class_find_style_property):
* gtk/gtkcontainer.c (gtk_container_class_find_child_property):
Doc typo fixes.
* gtk/tree_plus.xpm:
* gtk/tree_plus.xbm:
* gtk/tree_minus.xpm:
......
2002-12-10 Matthias Clasen <maclas@gmx.de>
* gtk/tmpl/gtktextview.sgml: Add docs.
* gtk/tree_widget.sgml: Fix some links.
* gtk/tmpl/gtkwindow.sgml: Add docs.
* gtk/tmpl/gtkeditable.sgml: Document GtkEditable as an interface,
not as an abstract base class.
* gtk/gtk-docs.sgml: Move GtkEditable from "Abstract Base Classes"
to "Numeric/Text Data Entry".
2002-12-09 Matthias Clasen <maclas@gmx.de>
* gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml: Add docs.
......
......@@ -322,6 +322,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
&GtkHScale;
&GtkVScale;
&GtkSpinButton;
&GtkEditable;
</chapter>
<chapter id="TextWidgetObjects">
......@@ -433,7 +434,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
&GtkBox;
&GtkButtonBox;
&GtkContainer;
&GtkEditable;
&GtkItem;
&GtkMisc;
&GtkObject;
......
......@@ -6,14 +6,11 @@ Interface for text-editing widgets.
<!-- ##### SECTION Long_Description ##### -->
<para>
The #GtkEditable class is a base class for widgets
for editing text, such as #GtkEntry and #GtkText. It
cannot be instantiated by itself. The editable
class contains functions for generically manipulating
an editable widget, a large number of action signals
used for key bindings, and several signals that
an application can connect to to modify the behavior
of a widget.
The #GtkEditable interface is an interface which should be implemented by
text editing widgets, such as #GtkEntry and #GtkText. It contains functions
for generically manipulating an editable widget, a large number of action
signals used for key bindings, and several signals that an application can
connect to to modify the behavior of a widget.
</para>
<para>
......
......@@ -325,7 +325,10 @@ types related to the text widget and how they work together.
<!-- ##### STRUCT GtkTextChildAnchor ##### -->
<para id="GtkTextChildAnchor">
A <structname>GtkTextChildAnchor</structname> is a spot in the buffer
where child widgets can be "anchored" (inserted inline, as if they were
characters). The anchor can have multiple widgets anchored, to allow for
multiple views.
</para>
......
......@@ -123,9 +123,9 @@ the child gets a larger allocation than it requests.
@window: the window
@allow_shrink: whether the user can shrink the window below its size request
@allow_grow: whether the user can grow the window larger than its size request
@auto_shrink: whether the window automatically snaps back to its size request if
it's larger
@auto_shrink: whether the window automatically snaps back to its size request
if it's larger
@Deprecated: Use gtk_window_set_resizable() instead.
<!-- ##### FUNCTION gtk_window_set_resizable ##### -->
<para>
......
......@@ -83,14 +83,14 @@ GtkTreeStore *store = gtk_tree_store_new (N_COLUMNS, /* Total number of co
G_TYPE_BOOLEAN); /* Is checked out? */
]]></programlisting></informalexample>
<para>
Adding data to the model is done using <link linkend="gtk_tree_store_set">
gtk_tree_store_set()</link> or <link linkend="gtk_list_store_set">
Adding data to the model is done using <link linkend="gtk-tree-store-set">
gtk_tree_store_set()</link> or <link linkend="gtk-list-store-set">
gtk_list_store_set()</link>, depending upon which sort of model was
created. To do this, a <link linkend="GtkTreeIter">GtkTreeIter</link> must
be acquired. The iterator points to the location where data will be added.
</para>
<para>
Once an iterator has been acquired, <link linkend="gtk_tree_store_set">
Once an iterator has been acquired, <link linkend="gtk-tree-store-set">
gtk_tree_store_set()</link> is used to apply data to the part of the model
that the iterator points to. Consider the following example:
</para>
......@@ -113,7 +113,7 @@ gtk_tree_store_set (store, &iter,
columns in a given row.
</para>
<para>
The third argument to gtk_tree_store_append() is the parent iterator. It
The third argument to <link linkend="gtk-tree-store-append">gtk_tree_store_append()</link> is the parent iterator. It
is used to add a row to a GtkTreeStore as a child of an existing row. This
means that the new row will only be visible when its parent is visible and
in its expanded state. Consider the following example:
......
......@@ -944,26 +944,27 @@ gdk_window_destroy_notify (GdkWindow *window)
static void
set_initial_hints (GdkWindow *window)
{
GdkDisplay *display = GDK_WINDOW_DISPLAY (window);
Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
Window xwindow = GDK_WINDOW_XID (window);
GdkWindowObject *private;
Atom atoms[6];
gint i;
private = (GdkWindowObject*) window;
private = (GdkWindowObject*) window;
if (private->state & GDK_WINDOW_STATE_ICONIFIED)
{
XWMHints *wm_hints;
wm_hints = XGetWMHints (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window));
wm_hints = XGetWMHints (xdisplay, xwindow);
if (!wm_hints)
wm_hints = XAllocWMHints ();
wm_hints->flags |= StateHint;
wm_hints->initial_state = IconicState;
XSetWMHints (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window), wm_hints);
XSetWMHints (xdisplay, xwindow, wm_hints);
XFree (wm_hints);
}
......@@ -976,53 +977,65 @@ set_initial_hints (GdkWindow *window)
if (private->state & GDK_WINDOW_STATE_MAXIMIZED)
{
atoms[i] = gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
atoms[i] = gdk_x11_get_xatom_by_name_for_display (xdisplay,
"_NET_WM_STATE_MAXIMIZED_VERT");
++i;
atoms[i] = gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
atoms[i] = gdk_x11_get_xatom_by_name_for_display (xdisplay,
"_NET_WM_STATE_MAXIMIZED_HORZ");
++i;
}
if (private->state & GDK_WINDOW_STATE_STICKY)
{
atoms[i] = gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
atoms[i] = gdk_x11_get_xatom_by_name_for_display (xdisplay,
"_NET_WM_STATE_STICKY");
++i;
}
if (private->state & GDK_WINDOW_STATE_FULLSCREEN)
{
atoms[i] = gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
atoms[i] = gdk_x11_get_xatom_by_name_for_display (xdisplay,
"_NET_WM_STATE_FULLSCREEN");
++i;
}
if (private->modal_hint)
{
atoms[i] = gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
atoms[i] = gdk_x11_get_xatom_by_name_for_display (xdisplay,
"_NET_WM_STATE_MODAL");
++i;
}
if (i > 0)
{
XChangeProperty (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window),
gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window), "_NET_WM_STATE"),
XChangeProperty (xdisplay,
xwindow,
gdk_x11_get_xatom_by_name_for_display (xdisplay, "_NET_WM_STATE"),
XA_ATOM, 32, PropModeReplace,
(guchar*) atoms, i);
}
else
{
XDeleteProperty (xdisplay,
xwindow,
gdk_x11_get_xatom_by_name_for_display (xdisplay, "_NET_WM_STATE"));
}
if (private->state & GDK_WINDOW_STATE_STICKY)
{
atoms[0] = 0xFFFFFFFF;
XChangeProperty (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XID (window),
gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window), "_NET_WM_DESKTOP"),
XChangeProperty (xdisplay,
xwindow,
gdk_x11_get_xatom_by_name_for_display (xdisplay, "_NET_WM_DESKTOP"),
XA_CARDINAL, 32, PropModeReplace,
(guchar*) atoms, 1);
}
else
{
XDeleteProperty (xdisplay,
xwindow,
gdk_x11_get_xatom_by_name_for_display (xdisplay, "_NET_WM_DESKTOP"));
}
}
static void
......
......@@ -663,7 +663,7 @@ gtk_container_class_install_child_property (GtkContainerClass *cclass,
* gtk_container_class_find_child_property:
* @cclass: a #GtkContainerClass
* @property_name: the name of the child property to find
* @returns: the #GParamSpec of the child property or %NULL if @class has ho
* @returns: the #GParamSpec of the child property or %NULL if @class has no
* child property with that name.
*
* Finds a child property of a container class by name.
......
......@@ -6402,7 +6402,7 @@ gtk_widget_class_install_style_property (GtkWidgetClass *class,
* gtk_widget_class_find_style_property:
* @klass: a #GtkWidgetClass
* @property_name: the name of the style property to find
* @returns: the #GParamSpec of the style property or %NULL if @class has ho
* @returns: the #GParamSpec of the style property or %NULL if @class has no
* style property with that name.
*
* Finds a style property of a widget class by name.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment