[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 06/41: Switch to GtkBox.

noreply at xfce.org noreply at xfce.org
Sat Aug 20 18:32:20 CEST 2016


This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 49cb0183b5d79f10a635aaf98a3a3b9733ef3ca9
Author: Graeme Gott <graeme at gottcode.org>
Date:   Sun Aug 7 13:47:05 2016 -0400

    Switch to GtkBox.
---
 panel-plugin/command-edit.cpp         |  2 +-
 panel-plugin/configuration-dialog.cpp | 12 ++++++------
 panel-plugin/plugin.cpp               |  2 +-
 panel-plugin/section-button.cpp       |  4 ++--
 panel-plugin/window.cpp               | 14 +++++++-------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/panel-plugin/command-edit.cpp b/panel-plugin/command-edit.cpp
index fab5e18..c6b55ca 100644
--- a/panel-plugin/command-edit.cpp
+++ b/panel-plugin/command-edit.cpp
@@ -29,7 +29,7 @@ using namespace WhiskerMenu;
 CommandEdit::CommandEdit(Command* command, GtkSizeGroup* label_size_group) :
 	m_command(command)
 {
-	m_widget = gtk_hbox_new(false, 6);
+	m_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 
 	bool active = m_command->get_shown();
 
diff --git a/panel-plugin/configuration-dialog.cpp b/panel-plugin/configuration-dialog.cpp
index b50e227..ffa6093 100644
--- a/panel-plugin/configuration-dialog.cpp
+++ b/panel-plugin/configuration-dialog.cpp
@@ -86,7 +86,7 @@ ConfigurationDialog::ConfigurationDialog(Plugin* plugin) :
 	gtk_notebook_append_page(notebook, init_search_actions_tab(), gtk_label_new_with_mnemonic(_("Search Actio_ns")));
 
 	// Add tabs to dialog
-	GtkBox* vbox = GTK_BOX(gtk_vbox_new(false, 8));
+	GtkBox* vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 8));
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
 	gtk_box_pack_start(vbox, GTK_WIDGET(notebook), true, true, 0);
 	GtkBox* contents = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(m_window)));
@@ -503,7 +503,7 @@ GtkWidget* ConfigurationDialog::init_appearance_tab()
 	// Create appearance page
 	GtkWidget* page = gtk_alignment_new(0, 0, 1, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(page), 8);
-	GtkBox* contents_vbox = GTK_BOX(gtk_vbox_new(false, 0));
+	GtkBox* contents_vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
 	gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(contents_vbox));
 
 
@@ -650,12 +650,12 @@ GtkWidget* ConfigurationDialog::init_behavior_tab()
 	// Create behavior page
 	GtkWidget* page = gtk_alignment_new(0, 0, 1, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(page), 8);
-	GtkBox* contents_vbox = GTK_BOX(gtk_vbox_new(false, 8));
+	GtkBox* contents_vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 8));
 	gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(contents_vbox));
 
 
 	// Create menu section
-	GtkBox* behavior_vbox = GTK_BOX(gtk_vbox_new(false, 6));
+	GtkBox* behavior_vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 6));
 	GtkWidget* behavior_frame = xfce_gtk_frame_box_new_with_content(_("Menu"), GTK_WIDGET(behavior_vbox));
 	gtk_box_pack_start(contents_vbox, behavior_frame, false, false, 6);
 	gtk_container_set_border_width(GTK_CONTAINER(behavior_frame), 0);
@@ -729,7 +729,7 @@ GtkWidget* ConfigurationDialog::init_commands_tab()
 	// Create commands page
 	GtkWidget* page = gtk_alignment_new(0, 0, 1, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(page), 8);
-	GtkBox* commands_vbox = GTK_BOX(gtk_vbox_new(false, 8));
+	GtkBox* commands_vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 8));
 	gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(commands_vbox));
 	GtkSizeGroup* label_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
@@ -815,7 +815,7 @@ GtkWidget* ConfigurationDialog::init_search_actions_tab()
 	g_signal_connect_slot(m_action_remove, "clicked", &ConfigurationDialog::remove_action, this);
 
 	GtkWidget* actions = gtk_alignment_new(0.5, 0, 0, 0);
-	GtkBox* actions_box = GTK_BOX(gtk_vbox_new(false, 6));
+	GtkBox* actions_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 6));
 	gtk_container_add(GTK_CONTAINER(actions), GTK_WIDGET(actions_box));
 	gtk_box_pack_start(actions_box, m_action_add, false, false, 0);
 	gtk_box_pack_start(actions_box, m_action_remove, false, false, 0);
diff --git a/panel-plugin/plugin.cpp b/panel-plugin/plugin.cpp
index fa0dd24..d3cb41b 100644
--- a/panel-plugin/plugin.cpp
+++ b/panel-plugin/plugin.cpp
@@ -126,7 +126,7 @@ Plugin::Plugin(XfcePanelPlugin* plugin) :
 	g_signal_connect_slot(m_button, "toggled", &Plugin::button_toggled, this);
 	gtk_widget_show(m_button);
 
-	m_button_box = GTK_BOX(gtk_hbox_new(false, 2));
+	m_button_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2));
 	gtk_container_add(GTK_CONTAINER(m_button), GTK_WIDGET(m_button_box));
 	gtk_container_set_border_width(GTK_CONTAINER(m_button_box), 0);
 	gtk_widget_show(GTK_WIDGET(m_button_box));
diff --git a/panel-plugin/section-button.cpp b/panel-plugin/section-button.cpp
index 13ea3bc..9bc67fc 100644
--- a/panel-plugin/section-button.cpp
+++ b/panel-plugin/section-button.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Graeme Gott <graeme at gottcode.org>
+ * Copyright (C) 2013, 2016 Graeme Gott <graeme at gottcode.org>
  *
  * This library is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ SectionButton::SectionButton(const gchar* icon, const gchar* text) :
 	gtk_button_set_focus_on_click(GTK_BUTTON(m_button), false);
 	g_signal_connect(m_button, "enter-notify-event", G_CALLBACK(on_enter_notify_event), GTK_TOGGLE_BUTTON(m_button));
 
-	GtkBox* box = GTK_BOX(gtk_hbox_new(false, 4));
+	GtkBox* box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4));
 	gtk_container_add(GTK_CONTAINER(m_button), GTK_WIDGET(box));
 
 	m_icon = xfce_panel_image_new();
diff --git a/panel-plugin/window.cpp b/panel-plugin/window.cpp
index 17555e1..304e3e7 100644
--- a/panel-plugin/window.cpp
+++ b/panel-plugin/window.cpp
@@ -144,13 +144,13 @@ WhiskerMenu::Window::Window() :
 	}
 
 	// Create box for packing children
-	m_vbox = GTK_BOX(gtk_vbox_new(false, 6));
+	m_vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 6));
 	gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(m_vbox));
 	gtk_container_set_border_width(GTK_CONTAINER(m_vbox), 2);
 
 	// Create box for packing commands
 	m_commands_align = GTK_ALIGNMENT(gtk_alignment_new(1, 0, 0, 0));
-	m_commands_box = GTK_BOX(gtk_hbox_new(false, 0));
+	m_commands_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
 	for (int i = 0; i < 4; ++i)
 	{
 		gtk_box_pack_start(m_commands_box, m_commands_button[i], false, false, 0);
@@ -158,7 +158,7 @@ WhiskerMenu::Window::Window() :
 	gtk_container_add(GTK_CONTAINER(m_commands_align), GTK_WIDGET(m_commands_box));
 
 	// Create box for packing username, commands, and resize widget
-	m_title_box = GTK_BOX(gtk_hbox_new(false, 0));
+	m_title_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
 	gtk_box_pack_start(m_vbox, GTK_WIDGET(m_title_box), false, false, 0);
 	gtk_box_pack_start(m_title_box, GTK_WIDGET(m_profilepic->get_widget()), false, false, 0);
 	gtk_box_pack_start(m_title_box, GTK_WIDGET(m_username), true, true, 0);
@@ -166,24 +166,24 @@ WhiskerMenu::Window::Window() :
 	gtk_box_pack_start(m_title_box, GTK_WIDGET(m_resizer->get_widget()), false, false, 0);
 
 	// Add search to layout
-	m_search_box = GTK_BOX(gtk_hbox_new(false, 6));
+	m_search_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6));
 	gtk_box_pack_start(m_vbox, GTK_WIDGET(m_search_box), false, true, 0);
 	gtk_box_pack_start(m_search_box, GTK_WIDGET(m_search_entry), true, true, 0);
 
 	// Create box for packing launcher pages and sidebar
-	m_contents_box = GTK_BOX(gtk_hbox_new(false, 6));
+	m_contents_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6));
 	gtk_box_pack_start(m_vbox, GTK_WIDGET(m_contents_box), true, true, 0);
 	gtk_box_pack_start(m_contents_box, m_search_results->get_widget(), true, true, 0);
 
 	// Create box for packing launcher pages
-	m_panels_box = GTK_BOX(gtk_vbox_new(false, 0));
+	m_panels_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
 	gtk_box_pack_start(m_contents_box, GTK_WIDGET(m_panels_box), true, true, 0);
 	gtk_box_pack_start(m_panels_box, m_favorites->get_widget(), true, true, 0);
 	gtk_box_pack_start(m_panels_box, m_recent->get_widget(), true, true, 0);
 	gtk_box_pack_start(m_panels_box, m_applications->get_widget(), true, true, 0);
 
 	// Create box for packing sidebar
-	m_sidebar_buttons = GTK_BOX(gtk_vbox_new(false, 0));
+	m_sidebar_buttons = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
 	gtk_box_pack_start(m_sidebar_buttons, GTK_WIDGET(m_favorites_button->get_button()), false, false, 0);
 	gtk_box_pack_start(m_sidebar_buttons, GTK_WIDGET(m_recent_button->get_button()), false, false, 0);
 	gtk_box_pack_start(m_sidebar_buttons, gtk_hseparator_new(), false, true, 0);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list