gdk/gdk.def Add missing entries.

2000-08-12  Tor Lillqvist  <tml@iki.fi>

	* gdk/gdk.def
	* gtk/gtk.def: Add missing entries.

	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Use
	OUT_TT_ONLY_PRECIS, try to get a TrueType font.

	* gdk/win32/gdkinput-win32.c (gdk_device_get_state): New
	function. Dummy implementation at this point.

	* gtk/makefile.mingw.in: Fix typo. Add testtext and testtextbuffer
	rules. Undefine GTK_COMPILATION when compiling the test programs.

	* gtk/gtkdebug.h: Mark gtk_debug_flags for export/import.

	* gdk_pixbuf.def: Add missing entry point.

15 files changed, 269 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index f7bf012b33..6d9738efd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2000-08-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add missing entries.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Use
+	OUT_TT_ONLY_PRECIS, try to get a TrueType font.
+
+	* gdk/win32/gdkinput-win32.c (gdk_device_get_state): New
+	function. Dummy implementation at this point.
+
+	* gtk/makefile.mingw.in: Fix typo. Add testtext and testtextbuffer
+	rules. Undefine GTK_COMPILATION when compiling the test programs.
+	
+	* gtk/gtkdebug.h: Mark gtk_debug_flags for export/import.
+
 2000-08-11  Tor Lillqvist  <tml@iki.fi>
 
 	* gtk/gtkfilesel.c: Add more calls to g_filename_{to,from}_utf8()
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f7bf012b33..6d9738efd3 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,19 @@
+2000-08-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add missing entries.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Use
+	OUT_TT_ONLY_PRECIS, try to get a TrueType font.
+
+	* gdk/win32/gdkinput-win32.c (gdk_device_get_state): New
+	function. Dummy implementation at this point.
+
+	* gtk/makefile.mingw.in: Fix typo. Add testtext and testtextbuffer
+	rules. Undefine GTK_COMPILATION when compiling the test programs.
+	
+	* gtk/gtkdebug.h: Mark gtk_debug_flags for export/import.
+
 2000-08-11  Tor Lillqvist  <tml@iki.fi>
 
 	* gtk/gtkfilesel.c: Add more calls to g_filename_{to,from}_utf8()
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f7bf012b33..6d9738efd3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+2000-08-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add missing entries.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Use
+	OUT_TT_ONLY_PRECIS, try to get a TrueType font.
+
+	* gdk/win32/gdkinput-win32.c (gdk_device_get_state): New
+	function. Dummy implementation at this point.
+
+	* gtk/makefile.mingw.in: Fix typo. Add testtext and testtextbuffer
+	rules. Undefine GTK_COMPILATION when compiling the test programs.
+	
+	* gtk/gtkdebug.h: Mark gtk_debug_flags for export/import.
+
 2000-08-11  Tor Lillqvist  <tml@iki.fi>
 
 	* gtk/gtkfilesel.c: Add more calls to g_filename_{to,from}_utf8()
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f7bf012b33..6d9738efd3 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+2000-08-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add missing entries.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Use
+	OUT_TT_ONLY_PRECIS, try to get a TrueType font.
+
+	* gdk/win32/gdkinput-win32.c (gdk_device_get_state): New
+	function. Dummy implementation at this point.
+
+	* gtk/makefile.mingw.in: Fix typo. Add testtext and testtextbuffer
+	rules. Undefine GTK_COMPILATION when compiling the test programs.
+	
+	* gtk/gtkdebug.h: Mark gtk_debug_flags for export/import.
+
 2000-08-11  Tor Lillqvist  <tml@iki.fi>
 
 	* gtk/gtkfilesel.c: Add more calls to g_filename_{to,from}_utf8()
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f7bf012b33..6d9738efd3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+2000-08-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add missing entries.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Use
+	OUT_TT_ONLY_PRECIS, try to get a TrueType font.
+
+	* gdk/win32/gdkinput-win32.c (gdk_device_get_state): New
+	function. Dummy implementation at this point.
+
+	* gtk/makefile.mingw.in: Fix typo. Add testtext and testtextbuffer
+	rules. Undefine GTK_COMPILATION when compiling the test programs.
+	
+	* gtk/gtkdebug.h: Mark gtk_debug_flags for export/import.
+
 2000-08-11  Tor Lillqvist  <tml@iki.fi>
 
 	* gtk/gtkfilesel.c: Add more calls to g_filename_{to,from}_utf8()
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f7bf012b33..6d9738efd3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+2000-08-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add missing entries.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Use
+	OUT_TT_ONLY_PRECIS, try to get a TrueType font.
+
+	* gdk/win32/gdkinput-win32.c (gdk_device_get_state): New
+	function. Dummy implementation at this point.
+
+	* gtk/makefile.mingw.in: Fix typo. Add testtext and testtextbuffer
+	rules. Undefine GTK_COMPILATION when compiling the test programs.
+	
+	* gtk/gtkdebug.h: Mark gtk_debug_flags for export/import.
+
 2000-08-11  Tor Lillqvist  <tml@iki.fi>
 
 	* gtk/gtkfilesel.c: Add more calls to g_filename_{to,from}_utf8()
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f7bf012b33..6d9738efd3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+2000-08-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/gdk.def
+	* gtk/gtk.def: Add missing entries.
+
+	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Use
+	OUT_TT_ONLY_PRECIS, try to get a TrueType font.
+
+	* gdk/win32/gdkinput-win32.c (gdk_device_get_state): New
+	function. Dummy implementation at this point.
+
+	* gtk/makefile.mingw.in: Fix typo. Add testtext and testtextbuffer
+	rules. Undefine GTK_COMPILATION when compiling the test programs.
+	
+	* gtk/gtkdebug.h: Mark gtk_debug_flags for export/import.
+
 2000-08-11  Tor Lillqvist  <tml@iki.fi>
 
 	* gtk/gtkfilesel.c: Add more calls to g_filename_{to,from}_utf8()
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 369a67c759..c9b49204fc 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-12  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk_pixbuf.def: Add missing entry point.
+
 2000-08-10  Havoc Pennington  <hp@redhat.com>
 
 	* Makefile.am (EXTRA_DIST): The *.def files had the wrong names
diff --git a/gdk-pixbuf/gdk_pixbuf.def b/gdk-pixbuf/gdk_pixbuf.def
index 546e3bc9f2..620b74e7d7 100644
--- a/gdk-pixbuf/gdk_pixbuf.def
+++ b/gdk-pixbuf/gdk_pixbuf.def
@@ -24,6 +24,7 @@ EXPORTS
 	gdk_pixbuf_get_height
 	gdk_pixbuf_get_module
 	gdk_pixbuf_get_n_channels
+	gdk_pixbuf_get_named_module
 	gdk_pixbuf_get_pixels
 	gdk_pixbuf_get_rowstride
 	gdk_pixbuf_get_type
diff --git a/gdk/gdk.def b/gdk/gdk.def
index 40e104cb25..f4d020d4e9 100644
--- a/gdk/gdk.def
+++ b/gdk/gdk.def
@@ -47,6 +47,10 @@ EXPORTS
 	gdk_cursor_new_from_pixmap
 	gdk_cursor_ref
 	gdk_cursor_unref
+	gdk_device_free_history
+	gdk_device_get_axis
+	gdk_device_get_history
+	gdk_device_get_state
 	gdk_device_set_axis_use
 	gdk_device_set_key
 	gdk_device_set_mode
@@ -108,6 +112,7 @@ EXPORTS
 	gdk_event_free
 	gdk_event_func
 	gdk_event_get
+	gdk_event_get_axis
 	gdk_event_get_graphics_expose
 	gdk_event_get_time
 	gdk_event_handler_set
diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 163796ab7a..952b36ab6a 100644
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -1281,7 +1281,7 @@ gdk_font_load_internal (const gchar *font_name)
       logfont.lfUnderline = FALSE;
       logfont.lfStrikeOut = FALSE;
       logfont.lfCharSet = ANSI_CHARSET;
-      logfont.lfOutPrecision = OUT_TT_PRECIS;
+      logfont.lfOutPrecision = OUT_TT_ONLY_PRECIS;
       logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
       logfont.lfQuality = PROOF_QUALITY;
       logfont.lfPitchAndFamily = DEFAULT_PITCH;
diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c
index 94091bf7bb..c1256e4fa5 100644
--- a/gdk/win32/gdkinput-win32.c
+++ b/gdk/win32/gdkinput-win32.c
@@ -1154,6 +1154,73 @@ _gdk_device_get_history (GdkDevice         *device,
 }
 
 void 
+gdk_device_get_state (GdkDevice       *device,
+		      GdkWindow       *window,
+		      gdouble         *axes,
+		      GdkModifierType *mask)
+{
+  gint i;
+
+  g_return_if_fail (device != NULL);
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  if (GDK_IS_CORE (device))
+    {
+      gint x_int, y_int;
+      
+      gdk_window_get_pointer (window, &x_int, &y_int, mask);
+
+      if (axes)
+	{
+	  axes[0] = x_int;
+	  axes[1] = y_int;
+	}
+    }
+  else
+    {
+      GdkDevicePrivate *gdkdev;
+      GdkInputWindow *input_window;
+      
+      if (mask)
+	gdk_window_get_pointer (window, NULL, NULL, mask);
+      
+      gdkdev = (GdkDevicePrivate *)device;
+      input_window = gdk_input_window_find (window);
+      g_return_if_fail (input_window != NULL);
+
+#if 0 /* FIXME */
+      state = XQueryDeviceState (gdk_display, gdkdev->xdevice);
+      input_class = state->data;
+      for (i = 0; i < state->num_classes; i++)
+	{
+	  switch (input_class->class)
+	    {
+	    case ValuatorClass:
+	      if (axes)
+		gdk_input_translate_coordinates (gdkdev, input_window,
+						 ((XValuatorState *)input_class)->valuators,
+						 axes, NULL, NULL);
+	      break;
+	      
+	    case ButtonClass:
+	      if (mask)
+		{
+		  *mask &= 0xFF;
+		  if (((XButtonState *)input_class)->num_buttons > 0)
+		    *mask |= ((XButtonState *)input_class)->buttons[0] << 7;
+		  /* GDK_BUTTON1_MASK = 1 << 8, and button n is stored
+		   * in bit 1<<(n%8) in byte n/8. n = 1,2,... */
+		}
+	      break;
+	    }
+	  input_class = (XInputClass *)(((char *)input_class)+input_class->length);
+	}
+      XFreeDeviceState (state);
+#endif
+    }
+}
+
+void 
 gdk_input_init (void)
 {
   gdk_input_ignore_core = FALSE;
diff --git a/gtk/gtk.def b/gtk/gtk.def
index ce1ec89131..7e5c51279b 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -433,6 +433,7 @@ EXPORTS
 	gtk_curve_set_range
 	gtk_curve_set_vector
 	gtk_data_get_type
+	gtk_debug_flags
 	gtk_dialog_get_type
 	gtk_dialog_new
 	gtk_drag_begin
@@ -1102,19 +1103,64 @@ EXPORTS
 	gtk_tearoff_menu_item_get_type
 	gtk_tearoff_menu_item_new
 	gtk_text_backward_delete
+	gtk_text_buffer_apply_tag
+	gtk_text_buffer_apply_tag_by_name
+	gtk_text_buffer_delete
+	gtk_text_buffer_get_char_count
+	gtk_text_buffer_get_iter_at_line
+	gtk_text_buffer_get_iter_at_line_offset
+	gtk_text_buffer_get_iter_at_mark
+	gtk_text_buffer_get_iter_at_offset
+	gtk_text_buffer_get_line_count
+	gtk_text_buffer_create_mark
+	gtk_text_buffer_create_tag
+	gtk_text_buffer_delete_mark
+	gtk_text_buffer_get_bounds
+	gtk_text_buffer_get_last_iter
+	gtk_text_buffer_get_mark
+	gtk_text_buffer_get_selection_bounds
+	gtk_text_buffer_get_slice
+	gtk_text_buffer_insert
+	gtk_text_buffer_insert_pixmap
+	gtk_text_buffer_modified
+	gtk_text_buffer_move_mark
+	gtk_text_buffer_new
+	gtk_text_buffer_set_modified
+	gtk_text_buffer_remove_tag
+	gtk_text_buffer_remove_tag_by_name
 	gtk_text_forward_delete
 	gtk_text_freeze
 	gtk_text_get_length
 	gtk_text_get_point
 	gtk_text_get_type
 	gtk_text_insert
+	gtk_text_iter_backward_chars
+	gtk_text_iter_forward_chars
+	gtk_text_iter_forward_line
+	gtk_text_iter_forward_search
+	gtk_text_iter_equal
+	gtk_text_iter_get_offset
+	gtk_text_iter_get_text
+	gtk_text_iter_is_last
+	gtk_text_iter_next_char
+	gtk_text_iter_prev_char
+	gtk_text_iter_spew
 	gtk_text_new
 	gtk_text_set_adjustments
 	gtk_text_set_editable
 	gtk_text_set_line_wrap
 	gtk_text_set_point
 	gtk_text_set_word_wrap
+	gtk_text_tag_get_type
 	gtk_text_thaw
+	gtk_text_unknown_char
+	gtk_text_unknown_char_utf8
+	gtk_text_view_get_type
+	gtk_text_view_get_wrap_mode
+	gtk_text_view_new_with_buffer
+	gtk_text_view_set_cursor_visible
+	gtk_text_view_set_editable
+	gtk_text_view_set_wrap_mode
 	gtk_timeout_add
 	gtk_timeout_add_full
 	gtk_timeout_remove
@@ -1242,6 +1288,7 @@ EXPORTS
 	gtk_widget_get_default_direction
 	gtk_widget_get_default_style
 	gtk_widget_get_default_visual
+	gtk_widget_get_direction
 	gtk_widget_get_events
 	gtk_widget_get_extension_events
 	gtk_widget_get_name
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index baa11e65f1..9b7933f66a 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -52,7 +52,17 @@ typedef enum {
       
 #endif /* G_ENABLE_DEBUG */
 
-extern guint gtk_debug_flags;
+#ifdef G_OS_WIN32
+#  ifdef GTK_COMPILATION
+#    define GTKVAR __declspec(dllexport)
+#  else
+#    define GTKVAR extern __declspec(dllimport)
+#  endif
+#else
+#  define GTKVAR extern
+#endif
+
+GTKVAR guint gtk_debug_flags;
 
 #ifdef __cplusplus
 }
diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index 7ef75d214c..23d32b616b 100644
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -47,7 +47,7 @@ all :						\
 	testrgb.exe				\
 	testselection.exe			\
 	testtext.exe				\
-	testtextbuffer.exe
+	testtextbuffer.exe			\
 	simple.exe
 
 gtk_OBJECTS =					\
@@ -376,49 +376,61 @@ testcalendar.exe : testcalendar.o
 
 # Must have separate rules for these objects that don't go in the DLL
 testcalendar.o : testcalendar.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testcalendar\" testcalendar.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testcalendar\" testcalendar.c
 
 testdnd.exe : testdnd.o
 	$(CC) $(CFLAGS) -o $@ testdnd.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 
 testdnd.o : testdnd.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
 
 testgtk.exe : testgtk.o
 	$(CC) $(CFLAGS) -o $@  testgtk.o $(GTK_LIBS) $(GDK_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 
 testgtk.o : testgtk.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
 
 testinput.exe : testinput.o
 	$(CC) $(CFLAGS) -o $@  testinput.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 
 testinput.o : testinput.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
 
 testrgb.exe : testrgb.o
 	$(CC) $(CFLAGS) -o $@  testrgb.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 
 testrgb.o : testrgb.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
 
 testselection.exe : testselection.o
 	$(CC) $(CFLAGS) -o $@  testselection.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 
 testselection.o : testselection.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
+
+testtext.exe : testtext.o
+	$(CC) $(CFLAGS) -o $@  testtext.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+testtext.o : testtext.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testtext\" testtext.c
+
+testtextbuffer.exe : testtextbuffer.o
+	$(CC) $(CFLAGS) -o $@  testtextbuffer.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+
+testtextbuffer.o : testtextbuffer.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testtextbuffer\" testtextbuffer.c
 
 testthreads.exe : testthreads.o
 	$(CC) $(CFLAGS) -o $@  testthreads.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PTHREAD_LIB) $(LDFLAGS)
 
 testthreads.o : testthreads.c
-	$(CC) $(CFLAGS) -I$(PTHREAD_INC) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
+	$(CC) $(CFLAGS) -I$(PTHREAD_INC) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
 
 simple.exe : simple.o
 	$(CC) $(CFLAGS) -o $@  simple.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 
 simple.o : simple.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c
+	$(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"simple\" simple.c
 
 # The rmgen target removes just the generated source files
 rmgen: