Don't put -lgthread in GLIB_LIBS, GLIB_DEPLIBS

Tue Apr 17 13:47:12 2001  Owen Taylor  <otaylor@redhat.com>

	* configure.in: Don't put -lgthread in GLIB_LIBS, GLIB_DEPLIBS

	* gtk/gtktypeutils.h gtk/gtksignals.h: Restore proper parameter
	names to compatibility #defines so docs work.

	* gtk/gtkenums.h: Remove GtkMenuFactoryType

	* gtk/gtkwindow.c gtk/gtkdnd.c: Docs cleanups.

	* configure.in: Don't include -lgthread in GLIB_LIBS, GLIB_DEPLIBS

	* tests/testgtkrc: No magenta cursors, please.

	* README.in INSTALL.in HACKING README.cvs-commits: Updated.

	* gtk/gtkenums.h (enum): Remove left over GtkMenuFactoryType.

5 files changed, 52 insertions, 40 deletions

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index f6af11f6cb..3b2a8b967f 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1095,7 +1095,7 @@ gtk_drag_dest_handle_event (GtkWidget *toplevel,
  * gtk_drag_dest_find_target:
  * @widget: drag destination widget
  * @context: drag context
- * @dest_target_list: list of droppable targets
+ * @target_list: list of droppable targets
  * 
  * Looks for a match between @context->targets and the
  * @dest_target_list, returning the first matching target, otherwise
@@ -1110,16 +1110,16 @@ gtk_drag_dest_handle_event (GtkWidget *toplevel,
 GdkAtom
 gtk_drag_dest_find_target (GtkWidget      *widget,
                            GdkDragContext *context,
-                           GtkTargetList  *dest_target_list)
+                           GtkTargetList  *target_list)
 {
   GList *tmp_target;
   GList *tmp_source = NULL;
   GtkWidget *source_widget = gtk_drag_get_source_widget (context);
 
-  if (dest_target_list == NULL)
+  if (target_list == NULL)
     return GDK_NONE;
   
-  tmp_target = dest_target_list->list;
+  tmp_target = target_list->list;
   while (tmp_target)
     {
       GtkTargetPair *pair = tmp_target->data;
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index d9ee74bb20..43e290f286 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -142,13 +142,6 @@ typedef enum
 
 typedef enum
 {
-  GTK_MENU_FACTORY_MENU,
-  GTK_MENU_FACTORY_MENU_BAR,
-  GTK_MENU_FACTORY_OPTION_MENU
-} GtkMenuFactoryType;
-
-typedef enum
-{
   GTK_PIXELS,
   GTK_INCHES,
   GTK_CENTIMETERS
diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 0b8234ecd8..5262401b1a 100644
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -44,31 +44,49 @@ extern "C" {
 
 /* --- compat defines --- */
 #define GTK_SIGNAL_OFFSET	                      GTK_STRUCT_OFFSET
-#define	gtk_signal_lookup			      g_signal_lookup
-#define	gtk_signal_name				      g_signal_name
-#define	gtk_signal_emit_stop(i,s)		      g_signal_stop_emission ((i), (s), 0)
-#define	gtk_signal_connect(o,s,f,d)		      gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 0, 0)
-#define	gtk_signal_connect_after(o,s,f,d)	      gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 0, 1)
-#define	gtk_signal_connect_object(o,s,f,d)	      gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 1, 0)
-#define	gtk_signal_connect_object_after(o,s,f,d)      gtk_signal_connect_full ((o), (s), (f), 0, (d), 0, 1, 1)
-#define	gtk_signal_disconnect			      g_signal_handler_disconnect
-#define	gtk_signal_handler_block		      g_signal_handler_block
-#define	gtk_signal_handler_unblock		      g_signal_handler_unblock
-#define	gtk_signal_disconnect_by_func(o,f,d)	      gtk_signal_compat_matched ((o), (f), (d), G_SIGNAL_MATCH_FUNC | \
-                                                                                                G_SIGNAL_MATCH_DATA, 0)
-#define	gtk_signal_disconnect_by_data(o,d)	      gtk_signal_compat_matched ((o), 0, (d), G_SIGNAL_MATCH_DATA, 0)
-#define	gtk_signal_handler_block_by_func(o,f,d)	      gtk_signal_compat_matched ((o), (f), (d), G_SIGNAL_MATCH_FUNC | \
-                                                                                                G_SIGNAL_MATCH_DATA, 1)
-#define	gtk_signal_handler_block_by_data(o,d)	      gtk_signal_compat_matched ((o), 0, (d), G_SIGNAL_MATCH_DATA, 1)
-#define	gtk_signal_handler_unblock_by_func(o,f,d)     gtk_signal_compat_matched ((o), (f), (d), G_SIGNAL_MATCH_FUNC | \
-                                                                                                G_SIGNAL_MATCH_DATA, 2)
-#define	gtk_signal_handler_unblock_by_data(o,d)	      gtk_signal_compat_matched ((o), 0, (d), G_SIGNAL_MATCH_DATA, 2)
-#define	gtk_signal_handler_pending(i,s,b)	      g_signal_has_handler_pending ((i), 0, (s), (b))
-#define	gtk_signal_handler_pending_by_func(o,s,b,f,d) (g_signal_handler_find ((o), G_SIGNAL_MATCH_ID | \
-			                                                           G_SIGNAL_MATCH_FUNC | \
-                                                                                   G_SIGNAL_MATCH_DATA | \
-                                                                                   ((b) ? 0 : G_SIGNAL_MATCH_UNBLOCKED), \
-                                   			                           (s), 0, 0, (f), (d)) != 0)
+#define	gtk_signal_lookup(name,object_type)	                                       \
+   g_signal_lookup ((name), (object_type))
+#define	gtk_signal_name(signal_id)                                                     \
+   g_signal_name (signal_id)
+#define	gtk_signal_emit_stop(object,signal_id)                                         \
+   g_signal_stop_emission ((object), (signal_id), 0)
+#define	gtk_signal_connect(object,name,func,func_data)                                 \
+   gtk_signal_connect_full ((object), (name), (func), 0, (func_data), 0, 0, 0)
+#define	gtk_signal_connect_after(object,name,func,func_data)                           \
+   gtk_signal_connect_full ((object), (name), (func), 0, (func_data), 0, 0, 1)
+#define	gtk_signal_connect_object(object,name,func,slot_object)                        \
+   gtk_signal_connect_full ((object), (name), (func), 0, (slot_object), 0, 1, 0)
+#define	gtk_signal_connect_object_after(object,name,func,slot_object)                  \
+   gtk_signal_connect_full ((object), (name), (func), 0, (slot_object), 0, 1, 1)
+#define	gtk_signal_disconnect(object,handler_id)                                       \
+   g_signal_handler_disconnect ((object), (handler_id))
+#define	gtk_signal_handler_block(object,handler_id)                                    \
+   g_signal_handler_block ((object), (handler_id))
+#define	gtk_signal_handler_unblock(object,handler_id)                                  \
+   g_signal_handler_unblock ((object), (handler_id))
+#define	gtk_signal_disconnect_by_func(object,func,data)	                               \
+   gtk_signal_compat_matched ((object), (func), (data), G_SIGNAL_MATCH_FUNC |          \
+                                                        G_SIGNAL_MATCH_DATA, 0)
+#define	gtk_signal_disconnect_by_data(object,data)                                     \
+   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 0)
+#define	gtk_signal_handler_block_by_func(object,func,data)                             \
+   gtk_signal_compat_matched ((object), (func), (data), G_SIGNAL_MATCH_FUNC |          \
+                                                        G_SIGNAL_MATCH_DATA, 1)
+#define	gtk_signal_handler_block_by_data(object,data)                                  \
+   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 1)
+#define	gtk_signal_handler_unblock_by_func(object,func,data)                           \
+   gtk_signal_compat_matched ((object), (func), (data), G_SIGNAL_MATCH_FUNC |          \
+                                                        G_SIGNAL_MATCH_DATA, 2)
+#define	gtk_signal_handler_unblock_by_data(object,data)                                \
+   gtk_signal_compat_matched ((object), 0, (data), G_SIGNAL_MATCH_DATA, 2)
+#define	gtk_signal_handler_pending(object,signal_id,may_be_blocked)                    \
+   g_signal_has_handler_pending ((object), 0, (signal_id), (may_be_blocked))
+#define	gtk_signal_handler_pending_by_func(object,signal_id,may_be_blocked,func,data)  \
+   (g_signal_handler_find ((object), G_SIGNAL_MATCH_ID |                               \
+                                     G_SIGNAL_MATCH_FUNC |                             \
+                                     G_SIGNAL_MATCH_DATA |                             \
+                                     ((may_be_blocked) ? 0 : G_SIGNAL_MATCH_UNBLOCKED),\
+                           (signal_id), 0, 0, (func), (data)) != 0)
 
 
 /* --- compat functions --- */
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index ed6ff88e5a..d88f7dd069 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -228,10 +228,10 @@ void		gtk_type_init	(GTypeDebugFlags debug_flags);
 
 
 /* --- compatibility defines --- */
-#define	gtk_type_name			 g_type_name
-#define	gtk_type_from_name		 g_type_from_name
-#define	gtk_type_parent			 g_type_parent
-#define	gtk_type_is_a			 g_type_is_a
+#define	gtk_type_name(type)		 g_type_name (type)
+#define	gtk_type_from_name(name)	 g_type_from_name (name)
+#define	gtk_type_parent(type)		 g_type_parent (type)
+#define	gtk_type_is_a(type, is_a_type)	 g_type_is_a ((type), (is_a_type))
 
 
 /* enum/flags compatibility functions, we strongly
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 7662fb9650..115b2ddea6 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3518,6 +3518,7 @@ gtk_window_begin_resize_drag  (GtkWindow    *window,
 
 /**
  * gtk_window_begin_move_drag:
+ * @window: a #GtkWindow
  * @button: mouse button that initiated the drag
  * @root_x: X position where the user clicked to initiate the drag, in root window coordinates
  * @root_y: Y position where the user clicked to initiate the drag