Owen Taylor a6e85956d2 Fix up merge slipup. ...

Mon Mar 27 20:56:14 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_queue_clear_area): Fix up
	merge slipup.

	* gdk/gdkinput.h: Fix missing line from merge.

2000-03-28 01:58:05 +00:00

..

win32

Remove the #ifndef USE_DISPATCHMESSAGE sections, we do want to use

2000-03-16 21:58:35 +00:00

x11

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

.cvsignore

…

COPYING

…

gdk.c

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdk.def

Use g_filename_to_utf8 to convert the font names Windows gives us from

2000-02-03 01:19:03 +00:00

gdk.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdkcc.h

…

gdkcolor.c

Include gdkinternals.h instead of gdkprivate.h.

2000-03-28 01:40:57 +00:00

gdkcolor.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdkcompat.h

use gdk_cursor_unref instead of destroy

2000-01-29 22:26:41 +00:00

gdkconfig.h.win32

…

gdkcursor.c

Include gdkinternals.h instead of gdkprivate.h.

2000-03-28 01:40:57 +00:00

gdkcursor.h

s/refcount/ref_count/.

2000-02-13 08:16:48 +00:00

gdkcursors.h

…

gdkdnd.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdkdraw.c

Include gdkinternals.h instead of gdkprivate.h.

2000-03-28 01:40:57 +00:00

gdkdrawable.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkevents.c

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkevents.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkfont.c

Include gdkinternals.h instead of gdkprivate.h.

2000-03-28 01:40:57 +00:00

gdkfont.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdkgc.c

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkgc.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdkglobals.c

…

gdki18n.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdkim.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdkimage.c

use gdk_cursor_unref instead of destroy

2000-01-29 22:26:41 +00:00

gdkimage.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkinput.h

Fix up merge slipup.

2000-03-28 01:58:05 +00:00

gdkinternals.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkkeysyms.h

…

gdkpixbuf-drawable.c

s/unsigned long/guint32/g, s/unsigned short/guint16/g, s/unsigned

2000-02-29 18:27:44 +00:00

gdkpixbuf-render.c

Added sanity check for width and height being >= 0. Also, do nothing if

2000-02-02 10:05:57 +00:00

gdkpixmap.h

gdk/gdkwindow.h Remove prototypes for renamed functions.

2000-01-28 12:16:26 +00:00

gdkpoly-generic.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkpolyreg-generic.c

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkprivate.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkproperty.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdkrectangle.c

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkregion-generic.c

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkregion-generic.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkregion.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkrgb.c

…

gdkrgb.h

…

gdkselection.h

Merges from gtk-1-2

2000-03-14 19:57:25 +00:00

gdktypes.h

Fix up merge slipup.

2000-03-28 01:58:05 +00:00

gdkvisual.h

…

gdkwindow.c

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

gdkwindow.h

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

Makefile.am

Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00

makefile.cygwin

Add an extra parameter so that we don't have to do unnecessary settings to

2000-02-13 14:52:47 +00:00

makefile.msc

Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function

2000-03-08 06:18:41 +00:00

TODO

…