X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/5fd4bed06b38f447b860b0e96316017a981ba40b..38c604ec4b161103576e1ecad95d67209da2967c:/gtk/gtkglue.c

diff --git a/gtk/gtkglue.c b/gtk/gtkglue.c
index 94afb79..6d57b43 100644
--- a/gtk/gtkglue.c
+++ b/gtk/gtkglue.c
@@ -1,5 +1,5 @@
 /* Common Lisp bindings for GTK+ v2.0
- * Copyright (C) 1999-2000 Espen S. Johnsen <esj@stud.cs.uit.no>
+ * Copyright (C) 1999-2002 Espen S. Johnsen <espen@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: gtkglue.c,v 1.6 2001-05-29 16:01:40 espen Exp $ */
+/* $Id: gtkglue.c,v 1.12 2002-04-02 15:05:44 espen Exp $ */
 
 
 #include <gtk/gtk.h>
@@ -37,14 +37,31 @@ gtk_query_version (guint *major, guint *minor, guint *micro)
 }
 
 
-/* Is this necessary? */
-
-GtkType
-gtk_object_type (GtkObject *obj)
+void gtk_callback_marshal (GtkWidget *widget, gpointer data)
 {
-  return GTK_OBJECT_TYPE (obj);
+  GValue arg;
+
+  memset (&arg, 0, sizeof (GValue));
+  g_value_init (&arg, gtk_widget_get_type ());
+  g_value_set_object (&arg, widget);
+  callback_marshal ((guint)data, NULL, 1, &arg);
 }
 
+void gtk_menu_position_callback_marshal (GtkMenu *menu, gint x, gint y,
+					 gboolean push_in, gpointer data)
+{
+  GValue args[3];
+
+  memset (args, 0, 3 * sizeof (GValue));
+  g_value_init (&args[0], G_TYPE_INT);
+  g_value_set_int (&args[0], x);
+  g_value_init (&args[1], G_TYPE_INT);
+  g_value_set_int (&args[1], y);
+  g_value_init (&args[2], G_TYPE_BOOLEAN);
+  g_value_set_boolean (&args[2], push_in);
+  
+  callback_marshal ((guint)data, NULL, 3, args);
+}
 
 
 /* Widget */
@@ -68,7 +85,7 @@ gtk_widget_mapped_p (GtkWidget *widget)
 }
 
 void
-gtk_widget_allocation (GtkWidget *widget, int *width, int *height)
+gtk_widget_get_size_allocation (GtkWidget *widget, int *width, int *height)
 {
   *width = widget->allocation.width;
   *height = widget->allocation.height;
@@ -84,31 +101,18 @@ gtk_container_get_focus_child (GtkContainer *container)
 }
 
 
-
-/* Menu item */
+/* Dialog */
 
 GtkWidget*
-gtk_menu_item_get_submenu (GtkMenuItem* menu_item)
-{
-  return menu_item->submenu;
-}
-
-GtkSubmenuPlacement
-gtk_menu_item_get_placement (GtkMenuItem* menu_item)
-{
-  return menu_item->submenu_placement;
-}
-
-gint
-gtk_menu_item_get_show_toggle (GtkMenuItem* menu_item)
+gtk_dialog_get_vbox (GtkDialog *dialog)
 {
-  return menu_item->show_toggle_indicator;
+  return dialog->vbox;
 }
 
-gint
-gtk_menu_item_get_show_submenu (GtkMenuItem* menu_item)
+GtkWidget*
+gtk_dialog_get_action_area (GtkDialog *dialog)
 {
-  return menu_item->show_submenu_indicator;
+  return dialog->action_area;
 }
 
 
@@ -128,13 +132,13 @@ gtk_check_menu_item_get_show_toggle (GtkCheckMenuItem* check_menu_item)
 }
 
 
+
 /* Window */
 
-void
-gtk_window_wmclass (GtkWindow* window, gchar* name, gchar* class)
+GtkWidget*
+gtk_window_get_default (GtkWindow *window)
 {
-  name = window->wmclass_name;
-  class = window->wmclass_class;
+  return window->default_widget;
 }
 
 
@@ -243,26 +247,9 @@ gtk_paned_child2 (GtkPaned *paned, guint *resize, guint *shrink)
   return paned->child2;
 }
 
-gint
-gtk_paned_get_position (GtkPaned *paned)
-{
-  if (paned->position_set == TRUE) 
-    return paned->child1_size;
-  else
-    return -1;
-}
-
 
 /* Layout */
 
-gint
-gtk_layout_get_size (GtkLayout *layout, gint *width, gint *height)
-		 
-{
-  *width =  layout->width;
-  *height = layout->height;
-}
-
 GdkWindow*
 gtk_layout_get_bin_window (GtkLayout *layout)
 {
@@ -279,47 +266,10 @@ gtk_list_selection (GtkList *list)
 }
 
 
-/* Menu */
-
-gboolean
-gtk_menu_get_tearoff_state (GtkMenu *menu)
-{
-  return menu->torn_off;
-}
-
-gchar*
-gtk_menu_get_title (GtkMenu *menu)
-{
-  return g_strdup (gtk_object_get_data (GTK_OBJECT (menu), "gtk-menu-title"));
-}
-
-
-/* Table */
-
-guint
-gtk_table_row_spacing (GtkTable *table,
-		       guint row)
-{
-  return table->rows[row].spacing;
-}
-
-guint
-gtk_table_column_spacing (GtkTable *table,
-			  guint col)
-{
-  return table->cols[col].spacing;
-}
-
 
 /* Toolbar */
 
 gint
-gtk_toolbar_num_children (GtkToolbar *toolbar)
-{
-  return toolbar->num_children;
-}
-
-gint
 gtk_toolbar_get_tooltips (GtkToolbar *toolbar)
 {
   return toolbar->tooltips->enabled;
@@ -354,30 +304,8 @@ gtk_progress_get_adjustment (GtkProgress *progress)
 }
 
 
-/* Scrolled window */
-     
-GtkWidget*
-gtk_scrolled_window_get_hscrollbar (GtkScrolledWindow *window)
-{
-  return window->hscrollbar;
-}
-
-GtkWidget*
-gtk_scrolled_window_get_vscrollbar (GtkScrolledWindow *window)
-{
-  return window->vscrollbar;
-}
-
-
-
 /* Tooltips */
 
-guint
-gtk_tooltips_get_delay (GtkTooltips *tooltips)
-{
-  return tooltips->delay;
-}
-
 gboolean
 gtk_tooltips_get_enabled (GtkTooltips *tooltips)
 {
@@ -456,7 +384,7 @@ gtk_style_set_color (GtkStyle *style, GtkColorType color_type,
   return gtk_style_get_color (style, color_type, state);
 }
 
-
+/*
 GdkFont*
 gtk_style_get_font (GtkStyle *style)
 {
@@ -469,7 +397,7 @@ gtk_style_set_font (GtkStyle *style, GdkFont *font)
 {
   return style->font = font;
 }
-
+*/
 
 GdkGC*
 gtk_style_get_gc (GtkStyle *style, GtkColorType color_type, GtkStateType state)