diff options
| author | Owen Taylor <otaylor@redhat.com> | 1999-11-08 20:14:59 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1999-11-08 20:14:59 +0000 |
| commit | e9b6bfcc01c0d76c2e5392a0d332bd0d00544ae7 (patch) | |
| tree | f2f741cf95b0b49eabf3a756a404413724c5d248 /gtk | |
| parent | cd02981bf22833edfca5c5af03278f5701246411 (diff) | |
| download | gtk+-e9b6bfcc01c0d76c2e5392a0d332bd0d00544ae7.tar.gz | |
Move all X specific code into the x11/ directory. Aside from shuffling
Mon Nov 8 14:47:04 1999 Owen Taylor <otaylor@redhat.com>
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.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 1 | ||||
| -rw-r--r-- | gtk/gtkwidget.h | 1 | ||||
| -rw-r--r-- | gtk/simple.c | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index b55a944e46..01ccba147d 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -418,6 +418,7 @@ INCLUDES = \ -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ -I$(top_srcdir) -I../gdk \ -I$(top_srcdir)/gdk \ + -I$(top_srcdir)/gdk/x11 \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ @GTK_LOCALE_FLAGS@ \ diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 0d804bae21..51ac815d7a 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -411,7 +411,6 @@ struct _GtkWidgetShapeInfo GdkBitmap *shape_mask; }; - GtkType gtk_widget_get_type (void); GtkWidget* gtk_widget_new (GtkType type, const gchar *first_arg_name, diff --git a/gtk/simple.c b/gtk/simple.c index dd73ca8d0e..17ff562b78 100644 --- a/gtk/simple.c +++ b/gtk/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 (), |