From e9b6bfcc01c0d76c2e5392a0d332bd0d00544ae7 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 8 Nov 1999 20:14:59 +0000 Subject: Move all X specific code into the x11/ directory. Aside from shuffling Mon Nov 8 14:47:04 1999 Owen Taylor Move all X specific code into the x11/ directory. Aside from shuffling things around, did the following: * gdk/gdkprivate.h gdk/gdk.h gdk/x11/gdkmain-x11.h: Add gdk_arg_context_* - a simple argument parsing system in the style of popt. * gdk/gdkdrawable.[ch] gdk/gdkprivate.h gdk/gdkwindow.[ch] gdk/x11/gdkprivate-x11.h: Remove X specific stuff from GdkDrawable and GdkWindowPrivate - add ->klass and ->klass_data fields. The klass_data field points to an auxilliary structure that is windowing system dependent. * gdk/gdkfont.c: Make most of the measurement functions simply wrappers around gdk_text_extents(). * gdk/gdkfont.c gdk/gdkprivate.h gdk/x11/gdkfont-x11.c: Add a _gdk_font_strlen() function that hides the weird behavior in gtk+-1.[02] where a string is interpreted differently for 8-bit and 16-bit fonts. * gdk/gdkevents.c: Add a new function gdk_event_button_generate() to store common code for synthesizing double/triple press events. * gdk/gdkgc.[ch]: Virtualize in the same way as gdkdrawable.h. Make all the function that modify an existing GC simply wrappers around gdk_gc_set_values(). * gdk/gdkcc.[ch]: Moved into x11/ directory in preparation for throwing out later. * gdk/gdkfont.c gdk/gdkimage.c gdk/gdkcolor.c: Change GdkFontPrivate, GdkImagePrivate and GdkColormapPrivate to have a windowing system dependent part (GdkFontPrivateX etc.) that "derives" from the system-independent part. * configure.in gdk/x11/Makefile.in gdk/x11/gdkinput*.c: Got rid of the included-source-files for XInput in favor of automake conditionals. (Which didn't exist when XInput support was originally added.) * gdk/gdkrgb.c: Remove the visual id from the debugging statements since that is X11 specific; print out type/depth info instead. --- tests/simple.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/simple.c') diff --git a/tests/simple.c b/tests/simple.c index dd73ca8d0..17ff562b7 100644 --- a/tests/simple.c +++ b/tests/simple.c @@ -14,7 +14,8 @@ main (int argc, char *argv[]) GtkWidget *window; GtkWidget *button; - gdk_progclass = g_strdup ("XTerm"); + /* FIXME: This is not allowable - what is this supposed to be? */ + /* gdk_progclass = g_strdup ("XTerm"); */ gtk_init (&argc, &argv); window = gtk_widget_new (gtk_window_get_type (), -- cgit v1.2.1