Changes in widget initialization

[clg] / gtk / gtkglue.c

diff --git a/gtk/gtkglue.c b/gtk/gtkglue.c
index 9ca23c9..2a2fbb8 100644 (file)
--- 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.4 2000-11-09 20:30:16 espen Exp $ */
+/* $Id: gtkglue.c,v 1.7 2001-10-21 23:22:53 espen Exp $ */
 
 
 #include <gtk/gtk.h>
@@ -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;
 }
 
 
@@ -128,15 +137,6 @@ gtk_check_menu_item_get_show_toggle (GtkCheckMenuItem* check_menu_item)
 }
 
 
-/* Tree item */
-
-GtkWidget*
-gtk_tree_item_get_subtree (GtkTreeItem* tree_item)
-{
-  return GTK_TREE_ITEM_SUBTREE (tree_item);
-}
-
-
 /* Window */
 
 void
@@ -231,115 +231,6 @@ gtk_combo_get_case_sensitive (GtkCombo *combo)
 }
 
 
-/* CList */
-
-#ifdef CLIST
-GList*
-gtk_clist_selection (GtkCList *clist)
-{
-  return clist->selection;
-}
-
-gint
-gtk_clist_get_titles_visible (GtkCList *clist)
-{
-  return (clist->title_window && GTK_WIDGET_VISIBLE (clist->title_window));
-}
-
-gint
-gtk_clist_get_n_rows (GtkCList *clist)
-{
-  return clist->rows;
-}
-
-gint
-gtk_clist_get_focus_row (GtkCList *clist)
-{
-  return clist->focus_row;
-}
-
-gint
-gtk_clist_get_sort_column (GtkCList *clist)
-{
-  return clist->sort_column;
-}
-
-GtkJustification
-gtk_clist_column_justification (GtkCList *clist,
-                                gint column)
-{
-  return clist->column[column].justification;
-}
-
-gboolean
-gtk_clist_column_visible_p (GtkCList *clist,
-                          gint column)
-{
-  return clist->column[column].visible;
-}
-
-gboolean
-gtk_clist_column_resizeable_p (GtkCList *clist,
-                            gint column)
-{
-  return clist->column[column].resizeable;
-}
-
-gboolean
-gtk_clist_column_auto_resize_p (GtkCList *clist,
-                               gint column)
-{
-  return clist->column[column].auto_resize;
-}
-
-gint
-gtk_clist_column_width (GtkCList *clist,
-                       gint column)
-{
-  return clist->column[column].width;
-}
-
-gboolean
-gtk_clist_auto_sort_p (GtkCList *clist)
-{
-  return GTK_CLIST_AUTO_SORT (clist);
-}
-#endif
-
-/* CTree */
-
-#ifdef CTREE
-gboolean
-gtk_ctree_node_leaf_p (GtkCTreeNode* node)
-{
-  return GTK_CTREE_ROW (node)->is_leaf;
-}
-
-GtkCTreeNode*
-gtk_ctree_node_child (GtkCTreeNode* node)
-{
-  return GTK_CTREE_ROW (node)->children;
-}
-
-GtkCTreeNode*
-gtk_ctree_node_parent (GtkCTreeNode* node)
-{
-  return GTK_CTREE_ROW (node)->parent;
-}
-
-GtkCTreeNode*
-gtk_ctree_node_sibling (GtkCTreeNode* node)
-{
-  return GTK_CTREE_ROW (node)->sibling;
-}
-
-gint
-gtk_ctree_node_level (GtkCTreeNode* node)
-{
-  return GTK_CTREE_ROW (node)->level;
-}
-#endif
-
 /* Paned */
 
 GtkWidget*
@@ -373,62 +264,46 @@ 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)
 {
   return layout->bin_window;
 }
 
-
-/* List */
-
-GList*
-gtk_list_selection (GtkList *list)
+guint
+gtk_layout_get_xoffset (GtkLayout *layout)
 {
-  return list->selection;
+  return layout->xoffset;
 }
 
-
-/* Menu */
-
-gboolean
-gtk_menu_get_tearoff_state (GtkMenu *menu)
+void
+gtk_layout_set_xoffset (GtkLayout *layout, guint xoffset)
 {
-  return menu->torn_off;
+  return layout->xoffset = xoffset;
 }
 
-gchar*
-gtk_menu_get_title (GtkMenu *menu)
+guint
+gtk_layout_get_yoffset (GtkLayout *layout)
 {
-  return g_strdup (gtk_object_get_data (GTK_OBJECT (menu), "gtk-menu-title"));
+  return layout->yoffset;
 }
 
-
-/* Table */
-
-guint
-gtk_table_row_spacing (GtkTable *table,
-                      guint row)
+void
+gtk_layout_set_yoffset (GtkLayout *layout, guint yoffset)
 {
-  return table->rows[row].spacing;
+  return layout->yoffset = yoffset;
 }
 
-guint
-gtk_table_column_spacing (GtkTable *table,
-                         guint col)
+/* List */
+
+GList*
+gtk_list_selection (GtkList *list)
 {
-  return table->cols[col].spacing;
+  return list->selection;
 }
 
 
+
 /* Toolbar */
 
 gint
@@ -444,39 +319,6 @@ gtk_toolbar_get_tooltips (GtkToolbar *toolbar)
 }
 
 
-/* Tree */
-
-GtkSelectionMode
-gtk_tree_get_selection_mode (GtkTree *tree)
-{
-  return tree->selection_mode;
-}
-
-GtkSelectionMode
-gtk_tree_get_view_mode (GtkTree *tree)
-{
-  return tree->view_mode;
-}
-
-GtkSelectionMode
-gtk_tree_get_view_lines (GtkTree *tree)
-{
-  return tree->view_mode;
-}
-
-GtkTree*
-gtk_tree_get_root_tree (GtkTree *tree)
-{
-  return GTK_TREE_ROOT_TREE (tree);
-}
-
-GList*
-gtk_tree_selection (GtkTree *tree)
-{
-  return GTK_TREE_SELECTION (tree);
-}
-
-
 /* Drawing area */
 
 void
@@ -505,30 +347,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)
 {
@@ -607,7 +427,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)
 {
@@ -620,7 +440,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)