diff options
| author | monsta <[email protected]> | 2016-01-20 13:11:30 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-01-20 13:11:30 +0300 |
| commit | 9277713c575f7ac30fb218b5955895050894f63a (patch) | |
| tree | 9e35ce62b2871de2a4cca7061208b3a6c4def380 /polkitgtkmate | |
| parent | bfc4984bf54831905b5f120917587852a3b551aa (diff) | |
| download | mate-polkit-9277713c575f7ac30fb218b5955895050894f63a.tar.bz2 mate-polkit-9277713c575f7ac30fb218b5955895050894f63a.tar.xz | |
use GtkBox instead of GtkHBox in both GTK+ builds
and fix deprecated usage of GtkHBox and GtkVBox in GTK+3 build
Diffstat (limited to 'polkitgtkmate')
| -rw-r--r-- | polkitgtkmate/example.c | 4 | ||||
| -rw-r--r-- | polkitgtkmate/polkitlockbutton.c | 4 | ||||
| -rw-r--r-- | polkitgtkmate/polkitlockbutton.h | 8 |
3 files changed, 4 insertions, 12 deletions
diff --git a/polkitgtkmate/example.c b/polkitgtkmate/example.c index da1d2e4..8b2da85 100644 --- a/polkitgtkmate/example.c +++ b/polkitgtkmate/example.c @@ -115,7 +115,11 @@ int main(int argc, char* argv[]) window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_resizable(GTK_WINDOW(window), TRUE); +#if GTK_CHECK_VERSION (3, 0, 0) + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); +#else vbox = gtk_vbox_new(FALSE, 12); +#endif gtk_container_set_border_width(GTK_CONTAINER(window), 12); gtk_container_add(GTK_CONTAINER(window), vbox); diff --git a/polkitgtkmate/polkitlockbutton.c b/polkitgtkmate/polkitlockbutton.c index e1ad610..1b15cbe 100644 --- a/polkitgtkmate/polkitlockbutton.c +++ b/polkitgtkmate/polkitlockbutton.c @@ -209,11 +209,7 @@ static void on_authority_changed(PolkitAuthority* authority, gpointer user_data) static void on_clicked(GtkButton* button, gpointer user_data); -#if GTK_CHECK_VERSION (3, 0, 0) G_DEFINE_TYPE(PolkitLockButton, polkit_lock_button, GTK_TYPE_BOX); -#else -G_DEFINE_TYPE(PolkitLockButton, polkit_lock_button, GTK_TYPE_HBOX); -#endif static void polkit_lock_button_finalize(GObject* object) { diff --git a/polkitgtkmate/polkitlockbutton.h b/polkitgtkmate/polkitlockbutton.h index ce3affe..4360815 100644 --- a/polkitgtkmate/polkitlockbutton.h +++ b/polkitgtkmate/polkitlockbutton.h @@ -57,11 +57,7 @@ typedef struct _PolkitLockButtonPrivate PolkitLockButtonPrivate; * should be accessed using the provided API. */ struct _PolkitLockButton { -#if GTK_CHECK_VERSION (3, 0, 0) GtkBox parent; -#else - GtkHBox parent; -#endif /*< private >*/ PolkitLockButtonPrivate* priv; @@ -75,11 +71,7 @@ struct _PolkitLockButton { * Class structure for #PolkitLockButton. */ struct _PolkitLockButtonClass { -#if GTK_CHECK_VERSION (3, 0, 0) GtkBoxClass parent_class; -#else - GtkHBoxClass parent_class; -#endif /* Signals */ void (*changed)(PolkitLockButton* button); |