[gtkmm-documentation] Fix 'make check' after Gtk::Alignment has been deprecated
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm-documentation] Fix 'make check' after Gtk::Alignment has been deprecated
- Date: Sun, 1 Jun 2014 17:08:44 +0000 (UTC)
commit a7af10a73d5ba8456c7de0107f33a8d20911f342
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Sun Jun 1 18:59:34 2014 +0200
Fix 'make check' after Gtk::Alignment has been deprecated
* examples/book/alignment/examplewindow.[h|cc]:
* examples/book/placessidebar/examplewindow.[h|cc]:
* examples/book/progressbar/examplewindow.[h|cc]: Use set_halign(),
set_margin_start() etc. instead of Alignment.
examples/book/alignment/examplewindow.cc | 11 +++++------
examples/book/alignment/examplewindow.h | 1 -
examples/book/placessidebar/examplewindow.cc | 6 +++---
examples/book/placessidebar/examplewindow.h | 1 -
examples/book/progressbar/examplewindow.cc | 6 +++---
examples/book/progressbar/examplewindow.h | 1 -
6 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/examples/book/alignment/examplewindow.cc b/examples/book/alignment/examplewindow.cc
index b2f6654..2eee464 100644
--- a/examples/book/alignment/examplewindow.cc
+++ b/examples/book/alignment/examplewindow.cc
@@ -19,16 +19,15 @@
#include "examplewindow.h"
ExampleWindow::ExampleWindow()
-: m_Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0),
- m_Button("Close")
+: m_Button("_Close", /* mnemonic= */ true)
{
- set_title("Gtk::Alignement");
+ set_title("Alignment");
set_border_width(10);
set_default_size(200, 50);
- add(m_Alignment);
-
- m_Alignment.add(m_Button);
+ m_Button.set_halign(Gtk::ALIGN_END);
+ m_Button.set_valign(Gtk::ALIGN_CENTER);
+ add(m_Button);
m_Button.signal_clicked().connect( sigc::mem_fun(*this,
&ExampleWindow::on_button_clicked) );
diff --git a/examples/book/alignment/examplewindow.h b/examples/book/alignment/examplewindow.h
index b84337e..d0e63e3 100644
--- a/examples/book/alignment/examplewindow.h
+++ b/examples/book/alignment/examplewindow.h
@@ -32,7 +32,6 @@ protected:
void on_button_clicked();
//Child widgets:
- Gtk::Alignment m_Alignment;
Gtk::Button m_Button;
};
diff --git a/examples/book/placessidebar/examplewindow.cc b/examples/book/placessidebar/examplewindow.cc
index a895274..f5aa076 100644
--- a/examples/book/placessidebar/examplewindow.cc
+++ b/examples/book/placessidebar/examplewindow.cc
@@ -31,7 +31,8 @@ ExampleWindow::ExampleWindow()
m_controls_frame.set_shadow_type(Gtk::SHADOW_NONE);
m_frame_label.set_markup("<b>Options</b>");
m_controls_frame.set_label_widget(m_frame_label);
- m_alignment.set_padding(6, 0, 12, 0);
+ m_controls.set_margin_top(6);
+ m_controls.set_margin_start(12);
m_show_desktop_check.signal_toggled().connect(sigc::mem_fun(*this,
&ExampleWindow::on_show_desktop_toggled));
m_show_desktop_check.set_active();
@@ -59,8 +60,7 @@ ExampleWindow::ExampleWindow()
}
// Layout
- m_controls_frame.add(m_alignment);
- m_alignment.add(m_controls);
+ m_controls_frame.add(m_controls);
m_hbox.pack_start(m_places_sidebar, Gtk::PACK_EXPAND_WIDGET);
m_hbox.pack_start(m_controls_frame, Gtk::PACK_SHRINK);
add(m_hbox);
diff --git a/examples/book/placessidebar/examplewindow.h b/examples/book/placessidebar/examplewindow.h
index 8173d2d..58c0dfc 100644
--- a/examples/book/placessidebar/examplewindow.h
+++ b/examples/book/placessidebar/examplewindow.h
@@ -42,7 +42,6 @@ protected:
Gtk::Grid m_controls;
Gtk::Frame m_controls_frame;
Gtk::Label m_frame_label;
- Gtk::Alignment m_alignment;
// Widgets
Gtk::PlacesSidebar m_places_sidebar;
diff --git a/examples/book/progressbar/examplewindow.cc b/examples/book/progressbar/examplewindow.cc
index fce1d4b..f77883f 100644
--- a/examples/book/progressbar/examplewindow.cc
+++ b/examples/book/progressbar/examplewindow.cc
@@ -21,7 +21,6 @@
ExampleWindow::ExampleWindow()
: m_VBox(Gtk::ORIENTATION_VERTICAL, 5),
- m_Alignment(0.5, 0.5, 0, 0),
m_CheckButton_Text("Show text"),
m_CheckButton_Activity("Activity mode"),
m_CheckButton_Inverted("Right to Left"),
@@ -34,8 +33,9 @@ ExampleWindow::ExampleWindow()
m_VBox.set_border_width(10);
add(m_VBox);
- m_VBox.pack_start(m_Alignment, Gtk::PACK_SHRINK, 5);
- m_Alignment.add(m_ProgressBar);
+ m_VBox.pack_start(m_ProgressBar, Gtk::PACK_SHRINK, 5);
+ m_ProgressBar.set_halign(Gtk::ALIGN_CENTER);
+ m_ProgressBar.set_valign(Gtk::ALIGN_CENTER);
m_ProgressBar.set_text("some text");
m_ProgressBar.set_show_text(false);
diff --git a/examples/book/progressbar/examplewindow.h b/examples/book/progressbar/examplewindow.h
index 649ff88..d20c0c2 100644
--- a/examples/book/progressbar/examplewindow.h
+++ b/examples/book/progressbar/examplewindow.h
@@ -37,7 +37,6 @@ protected:
//Child widgets:
Gtk::Box m_VBox;
- Gtk::Alignment m_Alignment;
Gtk::Grid m_Grid;
Gtk::ProgressBar m_ProgressBar;
Gtk::Separator m_Separator;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]