[gcalctool] Make MathButtons extend GtkWidget

[Robert Ancell <rancell src gnome org>]

commit 8514bab49ed3e8c065e74564517c7b86b4897fec
Author: Robert Ancell <robert ancell gmail com>
Date:   Mon Apr 5 18:17:39 2010 +1000

    Make MathButtons extend GtkWidget

 src/ui-buttons.c |   14 ++------------
 src/ui-buttons.h |    6 ++----
 src/ui.c         |    3 ++-
 3 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/src/ui-buttons.c b/src/ui-buttons.c
index cd6359d..64e7201 100644
--- a/src/ui-buttons.c
+++ b/src/ui-buttons.c
@@ -39,7 +39,6 @@ struct MathButtonsPrivate
 
     GdkColor colour_numbers, colour_action, colour_operator, colour_function, colour_memory, colour_trig, colour_group;
 
-    GtkWidget *button_vbox;
     GtkWidget *bas_panel, *adv_panel, *fin_panel, *prog_panel;
 
     GtkWidget *store_menu, *recall_menu;
@@ -58,7 +57,7 @@ struct MathButtonsPrivate
     GtkWidget *character_code_entry;
 };
 
-G_DEFINE_TYPE (MathButtons, ui_buttons, G_TYPE_OBJECT);
+G_DEFINE_TYPE (MathButtons, ui_buttons, GTK_TYPE_VBOX);
 
 #define UI_BASIC_FILE       UI_DIR "/buttons-basic.ui"
 #define UI_ADVANCED_FILE    UI_DIR "/buttons-advanced.ui"
@@ -148,13 +147,6 @@ ui_buttons_new(MathDisplay *display)
 }
 
 
-GtkWidget *
-ui_buttons_get_widget(MathButtons *buttons)
-{
-    return buttons->priv->button_vbox;
-}
-
-
 static GtkWidget *
 get_buttons(MathButtons *buttons, ButtonMode mode)
 {
@@ -335,7 +327,7 @@ load_mode(MathButtons *buttons, ButtonMode mode)
         g_clear_error(&error);
     }
     *panel = GET_WIDGET(builder, "button_panel");
-    gtk_box_pack_end(GTK_BOX(buttons->priv->button_vbox), *panel, FALSE, TRUE, 0);
+    gtk_box_pack_end(GTK_BOX(buttons), *panel, FALSE, TRUE, 0);
 
     /* Connect text to buttons */
     for (i = 0; button_data[i].widget_name != NULL; i++) {
@@ -1217,6 +1209,4 @@ ui_buttons_init (MathButtons *buttons)
     buttons->priv->colour_group.red = 65535;
     buttons->priv->colour_group.green = 65535;
     buttons->priv->colour_group.blue = 65535;
-    buttons->priv->button_vbox = gtk_vbox_new(FALSE, 0);
-    gtk_widget_show(buttons->priv->button_vbox);
 }
diff --git a/src/ui-buttons.h b/src/ui-buttons.h
index 9850fe6..89377a1 100644
--- a/src/ui-buttons.h
+++ b/src/ui-buttons.h
@@ -31,13 +31,13 @@ typedef struct MathButtonsPrivate MathButtonsPrivate;
 
 typedef struct
 {
-    GObject         parent_instance; // FIXME: Extend GtkVBox
+    GtkVBox parent_instance;
     MathButtonsPrivate *priv;
 } MathButtons;
 
 typedef struct
 {
-    GObjectClass parent_class;
+    GtkVBoxClass parent_class;
 } MathButtonsClass;
 
 typedef enum {
@@ -51,8 +51,6 @@ GType ui_buttons_get_type();
 
 MathButtons *ui_buttons_new(MathDisplay *display);
 
-GtkWidget *ui_buttons_get_widget(MathButtons *buttons);
-
 void ui_buttons_set_bitfield(MathButtons *buttons, int enabled, guint64 bits);
 
 void ui_buttons_set_mode(MathButtons *buttons, ButtonMode mode);
diff --git a/src/ui.c b/src/ui.c
index 5b47fcd..1da9010 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -307,6 +307,7 @@ ui_init(GCalctoolUI *ui)
 
     ui->priv->display = ui_display_new(ui->priv->ui);
     ui->priv->buttons = ui_buttons_new(ui->priv->display);
-    gtk_box_pack_end(GTK_BOX(GET_WIDGET(ui->priv->ui, "window_vbox")), ui_buttons_get_widget(ui->priv->buttons), TRUE, TRUE, 0);
+    gtk_box_pack_end(GTK_BOX(GET_WIDGET(ui->priv->ui, "window_vbox")), GTK_WIDGET(ui->priv->buttons), TRUE, TRUE, 0);
+    gtk_widget_show(GTK_WIDGET(ui->priv->buttons));
     ui->priv->preferences_dialog = ui_preferences_dialog_new(ui);
 }