[rhythmbox] use GtkBox instead of H/VBox in widget implementations
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] use GtkBox instead of H/VBox in widget implementations
- Date: Mon, 29 Dec 2014 11:13:14 +0000 (UTC)
commit 26851338669668eeb0520c6bd0e811dd3cb9c3b6
Author: Jonathan Matthew <jonathan d14n org>
Date: Tue Dec 23 09:15:25 2014 +1000
use GtkBox instead of H/VBox in widget implementations
sources/rb-display-page.c | 3 ++-
sources/rb-display-page.h | 4 ++--
sources/sync/rb-sync-settings-ui.c | 3 ++-
sources/sync/rb-sync-settings-ui.h | 4 ++--
sources/sync/rb-sync-state-ui.c | 3 ++-
sources/sync/rb-sync-state-ui.h | 4 ++--
widgets/rb-library-browser.c | 3 ++-
widgets/rb-library-browser.h | 4 ++--
widgets/rb-search-entry.c | 3 ++-
widgets/rb-search-entry.h | 4 ++--
10 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/sources/rb-display-page.c b/sources/rb-display-page.c
index f5c465d..7aae6d5 100644
--- a/sources/rb-display-page.c
+++ b/sources/rb-display-page.c
@@ -33,7 +33,7 @@
#include "rb-debug.h"
#include "rb-util.h"
-G_DEFINE_ABSTRACT_TYPE (RBDisplayPage, rb_display_page, GTK_TYPE_HBOX)
+G_DEFINE_ABSTRACT_TYPE (RBDisplayPage, rb_display_page, GTK_TYPE_BOX)
/**
* SECTION:rb-display-page
@@ -568,6 +568,7 @@ impl_finalize (GObject *object)
static void
rb_display_page_init (RBDisplayPage *page)
{
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (page), GTK_ORIENTATION_HORIZONTAL);
page->priv = G_TYPE_INSTANCE_GET_PRIVATE (page, RB_TYPE_DISPLAY_PAGE, RBDisplayPagePrivate);
page->priv->visible = TRUE;
diff --git a/sources/rb-display-page.h b/sources/rb-display-page.h
index e00692f..f626bda 100644
--- a/sources/rb-display-page.h
+++ b/sources/rb-display-page.h
@@ -49,14 +49,14 @@ typedef struct _RBDisplayPagePrivate RBDisplayPagePrivate;
struct _RBDisplayPage
{
- GtkHBox parent;
+ GtkBox parent;
RBDisplayPagePrivate *priv;
};
struct _RBDisplayPageClass
{
- GtkHBoxClass parent_class;
+ GtkBoxClass parent_class;
/* signals */
void (*status_changed) (RBDisplayPage *page);
diff --git a/sources/sync/rb-sync-settings-ui.c b/sources/sync/rb-sync-settings-ui.c
index 3167c47..c019682 100644
--- a/sources/sync/rb-sync-settings-ui.c
+++ b/sources/sync/rb-sync-settings-ui.c
@@ -50,7 +50,7 @@ enum {
PROP_SYNC_SETTINGS
};
-G_DEFINE_TYPE (RBSyncSettingsUI, rb_sync_settings_ui, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (RBSyncSettingsUI, rb_sync_settings_ui, GTK_TYPE_BOX)
static void
@@ -183,6 +183,7 @@ static void
rb_sync_settings_ui_init (RBSyncSettingsUI *ui)
{
ui->priv = G_TYPE_INSTANCE_GET_PRIVATE (ui, RB_TYPE_SYNC_SETTINGS_UI, RBSyncSettingsUIPrivate);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (ui), GTK_ORIENTATION_VERTICAL);
}
static void
diff --git a/sources/sync/rb-sync-settings-ui.h b/sources/sync/rb-sync-settings-ui.h
index 144140c..2ed4e7d 100644
--- a/sources/sync/rb-sync-settings-ui.h
+++ b/sources/sync/rb-sync-settings-ui.h
@@ -48,14 +48,14 @@ typedef struct _RBSyncSettingsUIPrivate RBSyncSettingsUIPrivate;
struct _RBSyncSettingsUI
{
- GtkVBox parent;
+ GtkBox parent;
RBSyncSettingsUIPrivate *priv;
};
struct _RBSyncSettingsUIClass
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
};
GType rb_sync_settings_ui_get_type (void);
diff --git a/sources/sync/rb-sync-state-ui.c b/sources/sync/rb-sync-state-ui.c
index 2dd8f94..ef86649 100644
--- a/sources/sync/rb-sync-state-ui.c
+++ b/sources/sync/rb-sync-state-ui.c
@@ -54,7 +54,7 @@ enum {
PROP_SYNC_STATE
};
-G_DEFINE_TYPE (RBSyncStateUI, rb_sync_state_ui, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (RBSyncStateUI, rb_sync_state_ui, GTK_TYPE_BOX)
static char *
@@ -214,6 +214,7 @@ static void
rb_sync_state_ui_init (RBSyncStateUI *ui)
{
ui->priv = G_TYPE_INSTANCE_GET_PRIVATE (ui, RB_TYPE_SYNC_STATE_UI, RBSyncStateUIPrivate);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (ui), GTK_ORIENTATION_VERTICAL);
}
static void
diff --git a/sources/sync/rb-sync-state-ui.h b/sources/sync/rb-sync-state-ui.h
index c265444..db84dbb 100644
--- a/sources/sync/rb-sync-state-ui.h
+++ b/sources/sync/rb-sync-state-ui.h
@@ -66,13 +66,13 @@ typedef struct _RBSyncStateUIClass RBSyncStateUIClass;
typedef struct _RBSyncStateUIPrivate RBSyncStateUIPrivate;
struct _RBSyncStateUI {
- GtkVBox parent;
+ GtkBox parent;
RBSyncStateUIPrivate *priv;
};
struct _RBSyncStateUIClass {
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
};
GType rb_sync_state_ui_get_type (void);
diff --git a/widgets/rb-library-browser.c b/widgets/rb-library-browser.c
index 79fec72..855186e 100644
--- a/widgets/rb-library-browser.c
+++ b/widgets/rb-library-browser.c
@@ -68,7 +68,7 @@ typedef struct _RBLibraryBrowserRebuildData RBLibraryBrowserRebuildData;
static void destroy_idle_rebuild_model (RBLibraryBrowserRebuildData *data);
-G_DEFINE_TYPE (RBLibraryBrowser, rb_library_browser, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (RBLibraryBrowser, rb_library_browser, GTK_TYPE_BOX)
#define RB_LIBRARY_BROWSER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RB_TYPE_LIBRARY_BROWSER,
RBLibraryBrowserPrivate))
/**
@@ -228,6 +228,7 @@ rb_library_browser_init (RBLibraryBrowser *widget)
RBLibraryBrowserPrivate *priv = RB_LIBRARY_BROWSER_GET_PRIVATE (widget);
gtk_box_set_spacing (GTK_BOX (widget), 5);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (widget), GTK_ORIENTATION_HORIZONTAL);
priv->property_views = g_hash_table_new (g_direct_hash, g_direct_equal);
priv->selections = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL,
(GDestroyNotify)rb_list_deep_free);
diff --git a/widgets/rb-library-browser.h b/widgets/rb-library-browser.h
index 75160bc..b06e80a 100644
--- a/widgets/rb-library-browser.h
+++ b/widgets/rb-library-browser.h
@@ -48,12 +48,12 @@ typedef struct _RBLibraryBrowserClass RBLibraryBrowserClass;
struct _RBLibraryBrowser
{
- GtkHBox parent;
+ GtkBox parent;
};
struct _RBLibraryBrowserClass
{
- GtkHBoxClass parent;
+ GtkBoxClass parent;
};
GType rb_library_browser_get_type (void);
diff --git a/widgets/rb-search-entry.c b/widgets/rb-search-entry.c
index d1cb21a..99e2ea2 100644
--- a/widgets/rb-search-entry.c
+++ b/widgets/rb-search-entry.c
@@ -72,7 +72,7 @@ struct RBSearchEntryPrivate
guint timeout;
};
-G_DEFINE_TYPE (RBSearchEntry, rb_search_entry, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (RBSearchEntry, rb_search_entry, GTK_TYPE_BOX)
#define RB_SEARCH_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RB_TYPE_SEARCH_ENTRY,
RBSearchEntryPrivate))
/**
@@ -204,6 +204,7 @@ static void
rb_search_entry_init (RBSearchEntry *entry)
{
entry->priv = RB_SEARCH_ENTRY_GET_PRIVATE (entry);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (entry), GTK_ORIENTATION_HORIZONTAL);
}
static void
diff --git a/widgets/rb-search-entry.h b/widgets/rb-search-entry.h
index 2049d29..4aa79d3 100644
--- a/widgets/rb-search-entry.h
+++ b/widgets/rb-search-entry.h
@@ -46,14 +46,14 @@ typedef struct RBSearchEntryPrivate RBSearchEntryPrivate;
struct _RBSearchEntry
{
- GtkHBox parent;
+ GtkBox parent;
RBSearchEntryPrivate *priv;
};
struct _RBSearchEntryClass
{
- GtkHBoxClass parent;
+ GtkBoxClass parent;
void (*search) (RBSearchEntry *view, const char *text);
void (*activate) (RBSearchEntry *entry, const char *text);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]