[gnome-commander/gcmd-1-3] GnomeCmdCombo: drop unnecessary casting to GNOME_CMD_COMBO

[Piotr Eljasiak <epiotr src gnome org>]

commit 3026cd29c76529c45c4dcf425c0b738d21c7f12d
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sat Oct 3 13:44:39 2009 +0200

    GnomeCmdCombo: drop unnecessary casting to GNOME_CMD_COMBO

 src/gnome-cmd-bookmark-dialog.cc |   14 +++++++-------
 src/gnome-cmd-main-win.cc        |    4 ++--
 src/widget-factory.h             |    4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/gnome-cmd-bookmark-dialog.cc b/src/gnome-cmd-bookmark-dialog.cc
index cfb0d7a..6d38817 100644
--- a/src/gnome-cmd-bookmark-dialog.cc
+++ b/src/gnome-cmd-bookmark-dialog.cc
@@ -43,7 +43,7 @@ struct GnomeCmdBookmarkDialogPrivate
     GnomeCmdBookmark *sel_bookmark;
     GnomeCmdBookmarkGroup *sel_group;
 
-    GtkWidget *combo;
+    GnomeCmdCombo *combo;
     GtkWidget *dir_list;
     GtkWidget *remove_btn;
     GtkWidget *edit_btn;
@@ -195,7 +195,7 @@ static void set_selected_group (GnomeCmdBookmarkDialog *dialog, GnomeCmdBookmark
 
     dialog->priv->sel_group = group;
 
-    gtk_entry_set_text (GTK_ENTRY (GNOME_CMD_COMBO (dialog->priv->combo)->entry), gnome_cmd_con_get_alias (group->con));
+    gtk_entry_set_text (GTK_ENTRY (dialog->priv->combo->entry), gnome_cmd_con_get_alias (group->con));
 
     gtk_clist_clear (GTK_CLIST (dialog->priv->dir_list));
 
@@ -380,8 +380,8 @@ static void add_groups (GnomeCmdBookmarkDialog *dialog)
         text[1] = (gchar *) gnome_cmd_con_get_alias (group->con);
         text[2] = NULL;
 
-        gint row = GNOME_CMD_COMBO (dialog->priv->combo)->append(text, group);
-        GNOME_CMD_COMBO (dialog->priv->combo)->set_pixmap(row, 0, pixmap);
+        gint row = dialog->priv->combo->append(text, group);
+        dialog->priv->combo->set_pixmap(row, 0, pixmap);
     }
 }
 
@@ -504,9 +504,9 @@ static void init (GnomeCmdBookmarkDialog *in_dialog)
     gnome_cmd_dialog_add_category (GNOME_CMD_DIALOG (dialog), cat);
 
     in_dialog->priv->combo = create_clist_combo (dialog, 2, 1, NULL);
-    gtk_clist_set_column_width (GTK_CLIST (GNOME_CMD_COMBO (in_dialog->priv->combo)->list), 0, 20);
-    gtk_clist_set_column_width (GTK_CLIST (GNOME_CMD_COMBO (in_dialog->priv->combo)->list), 1, 60);
-    gtk_box_pack_start (GTK_BOX (vbox), in_dialog->priv->combo, TRUE, TRUE, 0);
+    gtk_clist_set_column_width (GTK_CLIST (in_dialog->priv->combo->list), 0, 20);
+    gtk_clist_set_column_width (GTK_CLIST (in_dialog->priv->combo->list), 1, 60);
+    gtk_box_pack_start (GTK_BOX (vbox), *in_dialog->priv->combo, TRUE, TRUE, 0);
 
     hbox = create_hbox (dialog, FALSE, 12);
     cat = create_category (dialog, hbox, _("Bookmarks"));
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index 300df73..5c934cf 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -1142,7 +1142,7 @@ gboolean GnomeCmdMainWin::key_pressed(GdkEventKey *event)
                 {
                     GnomeCmdFileSelector *fs = this->fs(LEFT);
                     switch_fs(fs);
-                    GNOME_CMD_COMBO (fs->con_combo)->popup_list();
+                    fs->con_combo->popup_list();
                 }
                 return TRUE;
 
@@ -1150,7 +1150,7 @@ gboolean GnomeCmdMainWin::key_pressed(GdkEventKey *event)
                 {
                     GnomeCmdFileSelector *fs = this->fs(RIGHT);
                     switch_fs(fs);
-                    GNOME_CMD_COMBO (fs->con_combo)->popup_list();
+                    fs->con_combo->popup_list();
                 }
                 return TRUE;
 
diff --git a/src/widget-factory.h b/src/widget-factory.h
index 57274c6..59b5270 100644
--- a/src/widget-factory.h
+++ b/src/widget-factory.h
@@ -24,14 +24,14 @@
 #include "libgcmd/libgcmd-deps.h"
 #include "gnome-cmd-combo.h"
 
-inline GtkWidget *create_clist_combo (GtkWidget *parent, gint num_cols, gint text_col, gchar **titles)
+inline GnomeCmdCombo *create_clist_combo (GtkWidget *parent, gint num_cols, gint text_col, gchar **titles)
 {
     GnomeCmdCombo *combo = new GnomeCmdCombo(num_cols, text_col, titles);
     gtk_widget_ref (*combo);
     g_object_set_data_full (G_OBJECT (parent), "combo", combo, (GDestroyNotify) gtk_widget_unref);
     gtk_widget_show (*combo);
 
-    return *combo;
+    return combo;
 }
 
 #endif // __WIDGET_FACTORY_H__