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

diff --git a/gtk/gtkglue.c b/gtk/gtkglue.c
index 94afb79..9a60d46 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.10 2002-03-24 13:01:12 espen Exp $ */
 
 
 #include <gtk/gtk.h>
@@ -37,15 +37,15 @@ 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);
+}
 
 /* Widget */
 
@@ -68,7 +68,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,15 +84,24 @@ gtk_container_get_focus_child (GtkContainer *container)
 }
 
 
+/* Dialog */
 
-/* Menu item */
+GtkWidget*
+gtk_dialog_get_vbox (GtkDialog *dialog)
+{
+  return dialog->vbox;
+}
 
 GtkWidget*
-gtk_menu_item_get_submenu (GtkMenuItem* menu_item)
+gtk_dialog_get_action_area (GtkDialog *dialog)
 {
-  return menu_item->submenu;
+  return dialog->action_area;
 }
 
+
+
+/* Menu item */
+
 GtkSubmenuPlacement
 gtk_menu_item_get_placement (GtkMenuItem* menu_item)
 {
@@ -100,15 +109,15 @@ gtk_menu_item_get_placement (GtkMenuItem* menu_item)
 }
 
 gint
-gtk_menu_item_get_show_toggle (GtkMenuItem* menu_item)
+gtk_menu_item_get_show_submenu (GtkMenuItem* menu_item)
 {
-  return menu_item->show_toggle_indicator;
+  return menu_item->show_submenu_indicator;
 }
 
-gint
-gtk_menu_item_get_show_submenu (GtkMenuItem* menu_item)
+void
+gtk_menu_item_set_show_submenu (GtkMenuItem* menu_item, guint show)
 {
-  return menu_item->show_submenu_indicator;
+  menu_item->show_submenu_indicator = show;
 }
 
 
@@ -255,14 +264,6 @@ gtk_paned_get_position (GtkPaned *paned)
 
 /* 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,37 +280,6 @@ 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 */
 
@@ -354,30 +324,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 +404,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 +417,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)