X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/560af5c515eb5b6206040a9334de4254d2650147..2f779f71ae5fc3d82fc0d622571e7f3e086e7978:/gtk/gtkglue.c?ds=sidebyside

diff --git a/gtk/gtkglue.c b/gtk/gtkglue.c
index dcd199c..b232ae2 100644
--- a/gtk/gtkglue.c
+++ b/gtk/gtkglue.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: gtkglue.c,v 1.1 2000-08-14 16:45:01 espen Exp $ */
+/* $Id: gtkglue.c,v 1.3 2000-10-05 17:32:34 espen Exp $ */
 
 
 #include <gtk/gtk.h>
@@ -151,6 +151,12 @@ 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)
 {
@@ -199,61 +205,6 @@ gtk_window_wmclass (GtkWindow* window, gchar* name, gchar* class)
 }
 
 
-/* Color selection dialog */
-
-GtkWidget*
-gtk_color_selection_dialog_get_colorsel (GtkColorSelectionDialog* dialog)
-{
-  return dialog->colorsel;
-}
-
-/*  GtkWidget* */
-/*  gtk_color_selection_dialog_get_main_vbox (GtkColorSelectionDialog* dialog) */
-/*  { */
-/*    return dialog->main_vbox; */
-/*  } */
-
-GtkWidget*
-gtk_color_selection_dialog_get_ok_button (GtkColorSelectionDialog* dialog)
-{
-  return dialog->ok_button;
-}
-
-/*  GtkWidget* */
-/*  gtk_color_selection_dialog_get_reset_button (GtkColorSelectionDialog* dialog) */
-/*  { */
-/*    return dialog->reset_button; */
-/*  } */
-
-GtkWidget*
-gtk_color_selection_dialog_get_cancel_button (GtkColorSelectionDialog* dialog)
-{
-  return dialog->cancel_button;
-}
-
-GtkWidget*
-gtk_color_selection_dialog_get_help_button (GtkColorSelectionDialog* dialog)
-{
-  return dialog->help_button;
-}
-
-
-/* Dialog */
-
-GtkWidget*
-gtk_dialog_get_action_area (GtkDialog *dialog)
-{
-  return dialog->action_area;
-}
-
-
-GtkWidget*
-gtk_dialog_get_vbox (GtkDialog *dialog)
-{
-  return dialog->vbox;
-}
-
-
 /* File selection */
 
 GtkWidget*
@@ -277,7 +228,6 @@ gtk_file_selection_get_cancel_button (GtkFileSelection *filesel)
 
 /* Color selection */
 
-void
 gtk_color_selection_set_color_by_values (GtkColorSelection *colorsel,
 					 gdouble red,
 					 gdouble green,
@@ -482,21 +432,13 @@ gtk_paned_get_position (GtkPaned *paned)
 /* Layout */
 
 gint
-gtk_layout_size (GtkLayout *layout, gint *width, gint *height)
+gtk_layout_get_size (GtkLayout *layout, gint *width, gint *height)
 		 
 {
   *width =  layout->width;
   *height = layout->height;
 }
 
-void
-gtk_layout_offset (GtkLayout *layout, gint *x, gint *y)
-{
-  *x = layout->xoffset;
-  *y = layout->yoffset;  
-}
-
-
 GdkWindow*
 gtk_layout_get_bin_window (GtkLayout *layout)
 {
@@ -513,6 +455,21 @@ 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
@@ -538,6 +495,12 @@ gtk_toolbar_num_children (GtkToolbar *toolbar)
   return toolbar->num_children;
 }
 
+gint
+gtk_toolbar_get_tooltips (GtkToolbar *toolbar)
+{
+  return toolbar->tooltips->enabled;
+}
+
 
 /* Tree */
 
@@ -624,8 +587,11 @@ gtk_tooltips_get_delay (GtkTooltips *tooltips)
   return tooltips->delay;
 }
 
-
-
+gboolean
+gtk_tooltips_get_enabled (GtkTooltips *tooltips)
+{
+  return tooltips->enabled;
+}
 
 
 /* GtkStyle accessor functions */