[gtkmm-documentation/gtkmm-2-22] Fix the build with gtkmm 2.21.8.1.



commit 149e92f05f28887434f5587ef51d0c0e958343b3
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 20 14:14:42 2010 +0200

    Fix the build with gtkmm 2.21.8.1.
    
    * examples/book/alignment/examplewindow.cc:
    * examples/book/box/examplewindow.cc:
    * examples/book/frame/examplewindow.cc:
    * examples/book/spinbutton/examplewindow.cc: Use the non-deprecated
      ALIGN_START/END.

 ChangeLog                                 |   16 +++++++++++++---
 examples/book/alignment/examplewindow.cc  |    2 +-
 examples/book/box/examplewindow.cc        |    8 ++++----
 examples/book/frame/examplewindow.cc      |    2 +-
 examples/book/spinbutton/examplewindow.cc |   10 +++++-----
 5 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 247fdd9..633add7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,25 @@
+2010-09-20  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with gtkmm 2.21.8.1.
+
+	* examples/book/alignment/examplewindow.cc:
+	* examples/book/box/examplewindow.cc:
+	* examples/book/frame/examplewindow.cc:
+	* examples/book/spinbutton/examplewindow.cc: Use the non-deprecated
+  ALIGN_START/END.
+
 2010-07-21  Murray Cumming  <murrayc murrayc com>
 
 	Buttons chapter: Remove text about non-existant XPMLabelBox class.
 
-	* docs/tutorial/C/gtkmm-tutorial-in.xml: The mention of an XPMLabelBox 
+	* docs/tutorial/C/gtkmm-tutorial-in.xml: The mention of an XPMLabelBox
 	was very odd and probably about a very very old version of the API.
 
 2010-07-16  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with latest gtkmm-2.22 with --enable-warnings=fatal.
-	
-	Generally include gtkmm/box.h before other gtkmm headers and include 
+
+	Generally include gtkmm/box.h before other gtkmm headers and include
 	gtkmm/main.h after other gtkmm headers. Not pleasant.
 
 2010-06-01  Murray Cumming  <murrayc murrayc com>
diff --git a/examples/book/alignment/examplewindow.cc b/examples/book/alignment/examplewindow.cc
index 698154c..b2f6654 100644
--- a/examples/book/alignment/examplewindow.cc
+++ b/examples/book/alignment/examplewindow.cc
@@ -19,7 +19,7 @@
 #include "examplewindow.h"
 
 ExampleWindow::ExampleWindow()
-: m_Alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, 0.0, 0.0),
+: m_Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0),
   m_Button("Close")
 {
   set_title("Gtk::Alignement");
diff --git a/examples/book/box/examplewindow.cc b/examples/book/box/examplewindow.cc
index bedaa58..f37b411 100644
--- a/examples/book/box/examplewindow.cc
+++ b/examples/book/box/examplewindow.cc
@@ -34,7 +34,7 @@ ExampleWindow::ExampleWindow(int which)
 
       // Align the label to the left side.  We'll discuss this function and
       // others in the section on Widget Attributes.
-      m_Label1.set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP);
+      m_Label1.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_START);
 
       // Pack the label into the vertical box (vbox box1).  Remember that
       // widgets added to a vbox will be packed one on top of the other in
@@ -63,7 +63,7 @@ ExampleWindow::ExampleWindow(int which)
 
       // create another new label, and show it.
       m_Label2.set_text("Gtk::HBox(true, 0);");
-      m_Label2.set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP);
+      m_Label2.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_START);
       m_box1.pack_start(m_Label2, Gtk::PACK_SHRINK);
 
       // Args are: homogeneous, spacing, options, padding
@@ -83,7 +83,7 @@ ExampleWindow::ExampleWindow(int which)
     {
 
       m_Label1.set_text("Gtk::HBox(false, 10);");
-      m_Label1.set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP);
+      m_Label1.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_START);
       m_box1.pack_start(m_Label1, Gtk::PACK_SHRINK);
 
       pPackBox1 = Gtk::manage(new PackBox(false, 10, Gtk::PACK_EXPAND_PADDING));
@@ -96,7 +96,7 @@ ExampleWindow::ExampleWindow(int which)
 
 
       m_Label2.set_text("Gtk::HBox(false, 0);");
-      m_Label2.set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_TOP);
+      m_Label2.set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_START);
       m_box1.pack_start(m_Label2, Gtk::PACK_SHRINK);
 
       pPackBox3 = Gtk::manage(new PackBox(false, 0, Gtk::PACK_SHRINK, 10));
diff --git a/examples/book/frame/examplewindow.cc b/examples/book/frame/examplewindow.cc
index b15ea76..2a8406b 100644
--- a/examples/book/frame/examplewindow.cc
+++ b/examples/book/frame/examplewindow.cc
@@ -33,7 +33,7 @@ ExampleWindow::ExampleWindow()
   m_Frame.set_label("Gtk::Frame Widget");
 
   /* Align the label at the right of the frame */
-  //m_Frame.set_label_align(Gtk::ALIGN_RIGHT, Gtk::ALIGN_TOP);
+  //m_Frame.set_label_align(Gtk::ALIGN_END, Gtk::ALIGN_START);
 
   /* Set the style of the frame */
   m_Frame.set_shadow_type(Gtk::SHADOW_ETCHED_OUT);
diff --git a/examples/book/spinbutton/examplewindow.cc b/examples/book/spinbutton/examplewindow.cc
index 0e0a4ad..adbb139 100644
--- a/examples/book/spinbutton/examplewindow.cc
+++ b/examples/book/spinbutton/examplewindow.cc
@@ -60,7 +60,7 @@ ExampleWindow::ExampleWindow()
 
   m_VBox.pack_start(m_HBox_NotAccelerated, Gtk::PACK_EXPAND_WIDGET, 5);
 
-  m_Label_Day.set_alignment(Gtk::ALIGN_LEFT);
+  m_Label_Day.set_alignment(Gtk::ALIGN_START);
   m_VBox_Day.pack_start(m_Label_Day);
 
   m_SpinButton_Day.set_wrap();
@@ -69,7 +69,7 @@ ExampleWindow::ExampleWindow()
 
   m_HBox_NotAccelerated.pack_start(m_VBox_Day, Gtk::PACK_EXPAND_WIDGET, 5);
 
-  m_Label_Month.set_alignment(Gtk::ALIGN_LEFT);
+  m_Label_Month.set_alignment(Gtk::ALIGN_START);
   m_VBox_Month.pack_start(m_Label_Month);
 
   m_SpinButton_Month.set_wrap();
@@ -77,7 +77,7 @@ ExampleWindow::ExampleWindow()
 
   m_HBox_NotAccelerated.pack_start(m_VBox_Month, Gtk::PACK_EXPAND_WIDGET, 5);
 
-  m_Label_Year.set_alignment(Gtk::ALIGN_LEFT);
+  m_Label_Year.set_alignment(Gtk::ALIGN_START);
   m_VBox_Year.pack_start(m_Label_Year);
 
   m_SpinButton_Year.set_wrap();
@@ -96,7 +96,7 @@ ExampleWindow::ExampleWindow()
 
   m_HBox_Accelerated.pack_start(m_VBox_Value, Gtk::PACK_EXPAND_WIDGET, 5);
 
-  m_Label_Value.set_alignment(Gtk::ALIGN_LEFT);
+  m_Label_Value.set_alignment(Gtk::ALIGN_START);
   m_VBox_Value.pack_start(m_Label_Value);
 
   m_SpinButton_Value.set_wrap();
@@ -105,7 +105,7 @@ ExampleWindow::ExampleWindow()
 
   m_HBox_Accelerated.pack_start(m_VBox_Digits, Gtk::PACK_EXPAND_WIDGET, 5);
 
-  m_Label_Digits.set_alignment(Gtk::ALIGN_LEFT);
+  m_Label_Digits.set_alignment(Gtk::ALIGN_START);
   m_VBox_Digits.pack_start(m_Label_Digits);
 
   m_SpinButton_Digits.set_wrap();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]