[gtkmm-documentation/gtkmm-2-24] Fix the build with --enable-warnings=fatal.

[Murray Cumming <murrayc src gnome org>]

commit 4cc5606efb8c447756b6de68d26e0c6a76b18d2c
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Feb 1 12:43:51 2011 +0100

    Fix the build with --enable-warnings=fatal.
    
    * examples/book/combobox/text/examplewindow.cc:
    * examples/book/comboboxentry/complex/examplewindow.[h|cc]:
    * examples/book/comboboxentry/text/examplewindow.[h|cc]: Use ComboBox instead
    of ComboBoxEntry. Use ComboBoxText instead of ComboBoxEntryText.
    Use append() instead of append_text().

 ChangeLog                                          |   10 ++++++++++
 examples/book/combobox/text/examplewindow.cc       |    6 +++---
 .../book/comboboxentry/complex/examplewindow.cc    |    3 ++-
 .../book/comboboxentry/complex/examplewindow.h     |    4 ++--
 examples/book/comboboxentry/text/examplewindow.cc  |    7 ++++---
 examples/book/comboboxentry/text/examplewindow.h   |    4 ++--
 .../book/printing/advanced/printformoperation.cc   |    3 +--
 .../book/printing/simple/printformoperation.cc     |    3 +--
 8 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6d9ce65..2438805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-01  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with --enable-warnings=fatal.
+
+	* examples/book/combobox/text/examplewindow.cc:
+	* examples/book/comboboxentry/complex/examplewindow.[h|cc]:
+	* examples/book/comboboxentry/text/examplewindow.[h|cc]: Use ComboBox instead 
+	of ComboBoxEntry. Use ComboBoxText instead of ComboBoxEntryText.
+	Use append() instead of append_text().
+
 2011-01-12  Kjell Ahlstedt <kjell ahlstedt bredband net>
 
 	Modified the custom_widget example
diff --git a/examples/book/combobox/text/examplewindow.cc b/examples/book/combobox/text/examplewindow.cc
index b555cfa..66a0cde 100644
--- a/examples/book/combobox/text/examplewindow.cc
+++ b/examples/book/combobox/text/examplewindow.cc
@@ -25,9 +25,9 @@ ExampleWindow::ExampleWindow()
   set_title("ComboBoxText example");
 
   //Fill the combo:
-  m_Combo.append_text("something");
-  m_Combo.append_text("something else");
-  m_Combo.append_text("something or other");
+  m_Combo.append("something");
+  m_Combo.append("something else");
+  m_Combo.append("something or other");
 
   add(m_Combo);
 
diff --git a/examples/book/comboboxentry/complex/examplewindow.cc b/examples/book/comboboxentry/complex/examplewindow.cc
index 117e5d5..8a491da 100644
--- a/examples/book/comboboxentry/complex/examplewindow.cc
+++ b/examples/book/comboboxentry/complex/examplewindow.cc
@@ -21,6 +21,7 @@
 #include <iostream>
 
 ExampleWindow::ExampleWindow()
+: m_Combo(true /* has_entry */)
 {
   set_title("ComboBoxEntry example");
 
@@ -64,7 +65,7 @@ ExampleWindow::ExampleWindow()
   //m_Combo.pack_start(m_Columns.m_col_id);
   m_Combo.pack_start(m_Columns.m_col_name);
 
-  m_Combo.set_text_column(m_Columns.m_col_id);
+  m_Combo.set_entry_text_column(m_Columns.m_col_id);
 
   //Add the ComboBox to the window.
   add(m_Combo);
diff --git a/examples/book/comboboxentry/complex/examplewindow.h b/examples/book/comboboxentry/complex/examplewindow.h
index d8af68f..bf3c353 100644
--- a/examples/book/comboboxentry/complex/examplewindow.h
+++ b/examples/book/comboboxentry/complex/examplewindow.h
@@ -20,7 +20,7 @@
 #define GTKMM_EXAMPLEWINDOW_H
 
 #include <gtkmm/window.h>
-#include <gtkmm/comboboxentrytext.h>
+#include <gtkmm/combobox.h>
 #include <gtkmm/liststore.h>
 
 class ExampleWindow : public Gtk::Window
@@ -48,7 +48,7 @@ protected:
   ModelColumns m_Columns;
 
   //Child widgets:
-  Gtk::ComboBoxEntry m_Combo;
+  Gtk::ComboBox m_Combo;
   Glib::RefPtr<Gtk::ListStore> m_refTreeModel;
 };
 
diff --git a/examples/book/comboboxentry/text/examplewindow.cc b/examples/book/comboboxentry/text/examplewindow.cc
index 6de6111..032b229 100644
--- a/examples/book/comboboxentry/text/examplewindow.cc
+++ b/examples/book/comboboxentry/text/examplewindow.cc
@@ -21,13 +21,14 @@
 #include <iostream>
 
 ExampleWindow::ExampleWindow()
+: m_Combo(true /* has_entry */)
 {
   set_title("ComboBoxEntryText example");
 
   //Fill the combo:
-  m_Combo.append_text("something");
-  m_Combo.append_text("something else");
-  m_Combo.append_text("something or other");
+  m_Combo.append("something");
+  m_Combo.append("something else");
+  m_Combo.append("something or other");
 
   add(m_Combo);
 
diff --git a/examples/book/comboboxentry/text/examplewindow.h b/examples/book/comboboxentry/text/examplewindow.h
index ff13a25..a0c58f0 100644
--- a/examples/book/comboboxentry/text/examplewindow.h
+++ b/examples/book/comboboxentry/text/examplewindow.h
@@ -20,7 +20,7 @@
 #define GTKMM_EXAMPLEWINDOW_H
 
 #include <gtkmm/window.h>
-#include <gtkmm/comboboxentrytext.h>
+#include <gtkmm/comboboxtext.h>
 
 class ExampleWindow : public Gtk::Window
 {
@@ -33,7 +33,7 @@ protected:
   void on_combo_changed();
 
   //Child widgets:
-  Gtk::ComboBoxEntryText m_Combo;
+  Gtk::ComboBoxText m_Combo;
 };
 
 #endif //GTKMM_EXAMPLEWINDOW_H
diff --git a/examples/book/printing/advanced/printformoperation.cc b/examples/book/printing/advanced/printformoperation.cc
index 86ae98b..71bd7ff 100644
--- a/examples/book/printing/advanced/printformoperation.cc
+++ b/examples/book/printing/advanced/printformoperation.cc
@@ -120,8 +120,7 @@ void PrintFormOperation::on_draw_page(
   cairo_ctx->set_source_rgb(0, 0, 0);
 
   //Render Pango LayoutLines over the Cairo context:
-  Pango::LayoutIter iter;
-  m_refLayout->get_iter(iter);
+  Pango::LayoutIter iter = m_refLayout->get_iter();
 
   double start_pos = 0;
   int line_index = 0;
diff --git a/examples/book/printing/simple/printformoperation.cc b/examples/book/printing/simple/printformoperation.cc
index 2c36ccb..6ddf67e 100644
--- a/examples/book/printing/simple/printformoperation.cc
+++ b/examples/book/printing/simple/printformoperation.cc
@@ -112,8 +112,7 @@ void PrintFormOperation::on_draw_page(
   cairo_ctx->set_source_rgb(0, 0, 0);
 
   //Render Pango LayoutLines over the Cairo context:
-  Pango::LayoutIter iter;
-  m_refLayout->get_iter(iter);
+  Pango::LayoutIter iter = m_refLayout->get_iter();
 
   double start_pos = 0;
   int line_index = 0;