Commit 43529d91 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Substitute gdkx.h => gdkprivate.h since we need to accesss only

Mon Nov  8 16:40:43 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
	we need to accesss only ->children. We need an accessor
	for the children.

	* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
	DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
	to get rid of gdkx.h include.

	* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
	and random references to 'None'.

	* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
	Get rid of unused #include <gdk/gdkx.h>

	* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
	gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
	gdkconfig.h.
parent b5f414a1
Mon Nov 8 16:40:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
we need to accesss only ->children. We need an accessor
for the children.
* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
to get rid of gdkx.h include.
* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
and random references to 'None'.
* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
Get rid of unused #include <gdk/gdkx.h>
* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
gdkconfig.h.
1999-11-08 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c
......
Mon Nov 8 16:40:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
we need to accesss only ->children. We need an accessor
for the children.
* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
to get rid of gdkx.h include.
* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
and random references to 'None'.
* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
Get rid of unused #include <gdk/gdkx.h>
* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
gdkconfig.h.
1999-11-08 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c
......
Mon Nov 8 16:40:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
we need to accesss only ->children. We need an accessor
for the children.
* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
to get rid of gdkx.h include.
* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
and random references to 'None'.
* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
Get rid of unused #include <gdk/gdkx.h>
* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
gdkconfig.h.
1999-11-08 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c
......
Mon Nov 8 16:40:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
we need to accesss only ->children. We need an accessor
for the children.
* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
to get rid of gdkx.h include.
* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
and random references to 'None'.
* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
Get rid of unused #include <gdk/gdkx.h>
* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
gdkconfig.h.
1999-11-08 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c
......
Mon Nov 8 16:40:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
we need to accesss only ->children. We need an accessor
for the children.
* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
to get rid of gdkx.h include.
* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
and random references to 'None'.
* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
Get rid of unused #include <gdk/gdkx.h>
* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
gdkconfig.h.
1999-11-08 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c
......
Mon Nov 8 16:40:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
we need to accesss only ->children. We need an accessor
for the children.
* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
to get rid of gdkx.h include.
* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
and random references to 'None'.
* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
Get rid of unused #include <gdk/gdkx.h>
* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
gdkconfig.h.
1999-11-08 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c
......
Mon Nov 8 16:40:43 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c: Substitute gdkx.h => gdkprivate.h since
we need to accesss only ->children. We need an accessor
for the children.
* gtk/gtkhandlebox.c gtk/testgtk.c: Substitute G
DK_ROOT_PARENT() => NULL, in call to gtk_window_get_pointer()
to get rid of gdkx.h include.
* gtk/gtkctree.c: Get rid of #include <gdk/gdkx.h>
and random references to 'None'.
* gtk/gtkclist.c gtk/gtkeditable.c gtk/gtkpreview.c
Get rid of unused #include <gdk/gdkx.h>
* gtk/gtkrc.c gtk/gtkmain.c: Get rid of #include <gdk/gdkx.h>
gdkx.h is _X_ specific stuff. GDK_WINDOWING comes from
gdkconfig.h.
1999-11-08 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdraw.c
......
......@@ -5,3 +5,4 @@ Makefile.in
_libs
.libs
libgdk-x11.la
gxid
......@@ -32,7 +32,6 @@
#include "gtkclist.h"
#include "gtkbindings.h"
#include "gtkdnd.h"
#include "gdkx.h"
#include <gdk/gdkkeysyms.h>
/* length of button_actions array */
......
......@@ -33,7 +33,6 @@
#include "gtkbindings.h"
#include "gtkmain.h"
#include "gtkdnd.h"
#include "gdkx.h"
#include <gdk/gdkkeysyms.h>
#define PM_SIZE 8
......@@ -708,7 +707,7 @@ gtk_ctree_realize (GtkWidget *widget)
if (ctree->line_style == GTK_CTREE_LINES_DOTTED)
{
gdk_gc_set_line_attributes (ctree->lines_gc, 1,
GDK_LINE_ON_OFF_DASH, None, None);
GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER);
gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2);
}
}
......@@ -5346,18 +5345,18 @@ gtk_ctree_set_line_style (GtkCTree *ctree,
case GTK_CTREE_LINES_SOLID:
if (GTK_WIDGET_REALIZED (ctree))
gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID,
None, None);
GDK_CAP_BUTT, GDK_JOIN_MITER);
break;
case GTK_CTREE_LINES_DOTTED:
if (GTK_WIDGET_REALIZED (ctree))
gdk_gc_set_line_attributes (ctree->lines_gc, 1,
GDK_LINE_ON_OFF_DASH, None, None);
GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_MITER);
gdk_gc_set_dashes (ctree->lines_gc, 0, "\1\1", 2);
break;
case GTK_CTREE_LINES_TABBED:
if (GTK_WIDGET_REALIZED (ctree))
gdk_gc_set_line_attributes (ctree->lines_gc, 1, GDK_LINE_SOLID,
None, None);
GDK_CAP_BUTT, GDK_JOIN_MITER);
break;
case GTK_CTREE_LINES_NONE:
break;
......
......@@ -26,9 +26,6 @@
#include <ctype.h>
#include <string.h>
#ifdef USE_XIM
#include "gdkx.h"
#endif
#include "gdk/gdkkeysyms.h"
#include "gdk/gdki18n.h"
#include "gtkeditable.h"
......
......@@ -26,7 +26,6 @@
*/
#include <stdlib.h>
#include "gdkx.h"
#include "gtkhandlebox.h"
#include "gtkmain.h"
#include "gtksignal.h"
......@@ -1026,7 +1025,7 @@ gtk_handle_box_motion (GtkWidget *widget,
*/
new_x = 0;
new_y = 0;
gdk_window_get_pointer (GDK_ROOT_PARENT(), &new_x, &new_y, NULL);
gdk_window_get_pointer (NULL, &new_x, &new_y, NULL);
new_x += hb->float_allocation.x;
new_y += hb->float_allocation.y;
......
......@@ -24,8 +24,6 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gdkx.h" /* For GDK_WINDOWING */
#ifdef GDK_WINDOWING_X11
#include <X11/Xlocale.h> /* so we get the right setlocale */
#else
......
......@@ -32,7 +32,6 @@
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#include "gdkx.h"
#include "gdk/gdkrgb.h"
#include "gtkpreview.h"
#include "gtksignal.h"
......
......@@ -26,8 +26,6 @@
#include "config.h"
#include "gdkx.h"
#ifdef GDK_WINDOWING_X11
#include <X11/Xlocale.h> /* so we get the right setlocale */
#else
......
......@@ -53,8 +53,7 @@
#include <stdarg.h>
#include <string.h>
#include "gdkx.h"
/* we need this for gdk_window_lookup() */
#include "gdkx.h" /* For gdk_window_lookup() */
#include "gtkmain.h"
#include "gtkselection.h"
#include "gtksignal.h"
......
......@@ -36,7 +36,7 @@
#include "gtkbindings.h"
#include "gtkprivate.h"
#include "gdk/gdk.h"
#include "gdkx.h"
#include "gdkprivate.h" /* Used in gtk_reset_shapes_recurse to avoid copy */
#define WIDGET_CLASS(w) GTK_WIDGET_CLASS (GTK_OBJECT (w)->klass)
......@@ -4784,9 +4784,6 @@ gtk_reset_shapes_recurse (GtkWidget *widget,
private = (GdkWindowPrivate*) window;
/* FIXME: We do we need this check? */
if (GDK_DRAWABLE_DESTROYED (window))
return;
gdk_window_get_user_data (window, &data);
if (data != widget)
return;
......
......@@ -28,7 +28,7 @@
#include <limits.h>
#include "gdk/gdk.h"
#include "gdk/gdkkeysyms.h"
#include "gdkx.h"
#include "gdkx.h" /* For gdk_progclass */
#include "gtkprivate.h"
#include "gtkrc.h"
#include "gtksignal.h"
......
......@@ -6575,8 +6575,6 @@ create_dnd (void)
* Shaped Windows
*/
static GdkWindow *root_win = NULL;
typedef struct _cursoroffset {gint x,y;} CursorOffset;
static void
......@@ -6621,7 +6619,7 @@ shape_motion (GtkWidget *widget,
* Can't use event->x / event->y here
* because I need absolute coordinates.
*/
gdk_window_get_pointer (root_win, &xp, &yp, &mask);
gdk_window_get_pointer (NULL, &xp, &yp, &mask);
gtk_widget_set_uposition (widget, xp - p->x, yp - p->y);
}
......@@ -6697,8 +6695,6 @@ create_shapes (void)
static GtkWidget *sheets = NULL;
static GtkWidget *rings = NULL;
root_win = gdk_window_foreign_new (GDK_ROOT_WINDOW ());
if (!modeller)
{
modeller = shape_create_icon ("Modeller.xpm",
......
......@@ -6575,8 +6575,6 @@ create_dnd (void)
* Shaped Windows
*/
static GdkWindow *root_win = NULL;
typedef struct _cursoroffset {gint x,y;} CursorOffset;
static void
......@@ -6621,7 +6619,7 @@ shape_motion (GtkWidget *widget,
* Can't use event->x / event->y here
* because I need absolute coordinates.
*/
gdk_window_get_pointer (root_win, &xp, &yp, &mask);
gdk_window_get_pointer (NULL, &xp, &yp, &mask);
gtk_widget_set_uposition (widget, xp - p->x, yp - p->y);
}
......@@ -6697,8 +6695,6 @@ create_shapes (void)
static GtkWidget *sheets = NULL;
static GtkWidget *rings = NULL;
root_win = gdk_window_foreign_new (GDK_ROOT_WINDOW ());
if (!modeller)
{
modeller = shape_create_icon ("Modeller.xpm",
......
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