[gtkmm-documentation] examples: Update for the latest gtkmm-4



commit 773d9207d00ab5ed76d774f5852c2ed29ecf7216
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Thu Mar 7 13:31:29 2019 +0100

    examples: Update for the latest gtkmm-4
    
    * examples/book/assistant/exampleassistant.cc:
    Gtk::Assistant::PageType -> Gtk::AssistantPage::Type.
    * examples/book/combobox/entry_complex/examplewindow.[cc|h]:
    * examples/book/combobox/entry_text/examplewindow.[cc|h]:
    * examples/book/headerbar/examplewindow.[cc|h]:
    * examples/others/cellrenderercustom/popupentry.cc:
    Gtk::Entry::signal_activate() has been removed.
    * examples/book/custom/custom_widget/mywidget.cc: Use Gtk::Widget::
    register_surface() instead of the removed Gdk::Surface::set_user_data().

 examples/book/assistant/exampleassistant.cc           |  4 ++--
 examples/book/combobox/entry_complex/examplewindow.cc | 13 ++++++-------
 examples/book/combobox/entry_complex/examplewindow.h  |  2 +-
 examples/book/combobox/entry_text/examplewindow.cc    | 12 ++++++------
 examples/book/combobox/entry_text/examplewindow.h     |  2 +-
 examples/book/custom/custom_widget/mywidget.cc        |  4 ++--
 examples/book/headerbar/examplewindow.cc              | 12 ++++++------
 examples/book/headerbar/examplewindow.h               |  6 +++---
 examples/others/cellrenderercustom/popupentry.cc      |  3 ++-
 9 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/examples/book/assistant/exampleassistant.cc b/examples/book/assistant/exampleassistant.cc
index 47ea80b..0a5675c 100644
--- a/examples/book/assistant/exampleassistant.cc
+++ b/examples/book/assistant/exampleassistant.cc
@@ -42,8 +42,8 @@ ExampleAssistant::ExampleAssistant()
   set_page_complete(m_check, true);
   set_page_complete(m_label2, true);
 
-  set_page_type(m_box, Gtk::Assistant::PageType::INTRO);
-  set_page_type(m_label2, Gtk::Assistant::PageType::CONFIRM);
+  set_page_type(m_box, Gtk::AssistantPage::Type::INTRO);
+  set_page_type(m_label2, Gtk::AssistantPage::Type::CONFIRM);
 
   signal_apply().connect(sigc::mem_fun(*this,
     &ExampleAssistant::on_assistant_apply));
diff --git a/examples/book/combobox/entry_complex/examplewindow.cc 
b/examples/book/combobox/entry_complex/examplewindow.cc
index da60899..d8aa211 100644
--- a/examples/book/combobox/entry_complex/examplewindow.cc
+++ b/examples/book/combobox/entry_complex/examplewindow.cc
@@ -68,14 +68,13 @@ ExampleWindow::ExampleWindow()
   add(m_Combo);
 
   //Connect signal handlers:
+  m_Combo.signal_changed().connect(sigc::mem_fun(*this, &ExampleWindow::on_combo_changed));
+
   auto entry = m_Combo.get_entry();
   if (entry)
   {
-    // Alternatively you can connect to m_Combo.signal_changed().
     entry->signal_changed().connect(sigc::mem_fun(*this,
       &ExampleWindow::on_entry_changed) );
-    entry->signal_activate().connect(sigc::mem_fun(*this,
-      &ExampleWindow::on_entry_activate) );
     m_ConnectionHasFocusChanged = entry->property_has_focus().signal_changed().
       connect(sigc::mem_fun(*this, &ExampleWindow::on_entry_has_focus_changed));
   }
@@ -91,22 +90,22 @@ ExampleWindow::~ExampleWindow()
   m_ConnectionHasFocusChanged.disconnect();
 }
 
-void ExampleWindow::on_entry_changed()
+void ExampleWindow::on_combo_changed()
 {
   auto entry = m_Combo.get_entry();
   if (entry)
   {
-    std::cout << "on_entry_changed(): Row=" << m_Combo.get_active_row_number()
+    std::cout << "on_combo_changed(): Row=" << m_Combo.get_active_row_number()
       << ", ID=" << entry->get_text() << std::endl;
   }
 }
 
-void ExampleWindow::on_entry_activate()
+void ExampleWindow::on_entry_changed()
 {
   auto entry = m_Combo.get_entry();
   if (entry)
   {
-    std::cout << "on_entry_activate(): Row=" << m_Combo.get_active_row_number()
+    std::cout << "on_entry_changed(): Row=" << m_Combo.get_active_row_number()
       << ", ID=" << entry->get_text() << std::endl;
   }
 }
diff --git a/examples/book/combobox/entry_complex/examplewindow.h 
b/examples/book/combobox/entry_complex/examplewindow.h
index 40cd75b..348cc1d 100644
--- a/examples/book/combobox/entry_complex/examplewindow.h
+++ b/examples/book/combobox/entry_complex/examplewindow.h
@@ -29,8 +29,8 @@ public:
 
 protected:
   //Signal handlers:
+  void on_combo_changed();
   void on_entry_changed();
-  void on_entry_activate();
   void on_entry_has_focus_changed();
 
   //Signal connection:
diff --git a/examples/book/combobox/entry_text/examplewindow.cc 
b/examples/book/combobox/entry_text/examplewindow.cc
index eb7aecb..9877844 100644
--- a/examples/book/combobox/entry_text/examplewindow.cc
+++ b/examples/book/combobox/entry_text/examplewindow.cc
@@ -31,14 +31,14 @@ ExampleWindow::ExampleWindow()
   add(m_Combo);
 
   //Connect signal handlers:
-  auto entry = m_Combo.get_entry();
-  // Alternatively you can connect to entry->signal_changed().
   m_Combo.signal_changed().connect(sigc::mem_fun(*this,
     &ExampleWindow::on_combo_changed) );
+
+  auto entry = m_Combo.get_entry();
   if (entry)
   {
-    entry->signal_activate().connect(sigc::mem_fun(*this,
-      &ExampleWindow::on_entry_activate) );
+    entry->signal_changed().connect(sigc::mem_fun(*this,
+      &ExampleWindow::on_entry_changed));
     m_ConnectionHasFocusChanged = entry->property_has_focus().signal_changed().
       connect(sigc::mem_fun(*this, &ExampleWindow::on_entry_has_focus_changed));
   }
@@ -62,9 +62,9 @@ void ExampleWindow::on_combo_changed()
     << ", Text=" << m_Combo.get_active_text() << std::endl;
 }
 
-void ExampleWindow::on_entry_activate()
+void ExampleWindow::on_entry_changed()
 {
-  std::cout << "on_entry_activate(): Row=" << m_Combo.get_active_row_number()
+  std::cout << "on_entry_changed(): Row=" << m_Combo.get_active_row_number()
     << ", Text=" << m_Combo.get_active_text() << std::endl;
 }
 
diff --git a/examples/book/combobox/entry_text/examplewindow.h 
b/examples/book/combobox/entry_text/examplewindow.h
index 8c92156..1ddc470 100644
--- a/examples/book/combobox/entry_text/examplewindow.h
+++ b/examples/book/combobox/entry_text/examplewindow.h
@@ -29,7 +29,7 @@ public:
 protected:
   //Signal handlers:
   void on_combo_changed();
-  void on_entry_activate();
+  void on_entry_changed();
   void on_entry_has_focus_changed();
 
   //Signal connection:
diff --git a/examples/book/custom/custom_widget/mywidget.cc b/examples/book/custom/custom_widget/mywidget.cc
index 4b0a5e6..7db4940 100644
--- a/examples/book/custom/custom_widget/mywidget.cc
+++ b/examples/book/custom/custom_widget/mywidget.cc
@@ -148,8 +148,8 @@ void MyWidget::on_realize()
     m_refGdkSurface = Gdk::Surface::create_child(get_parent_surface(), get_allocation());
     set_surface(m_refGdkSurface);
 
-    //make the widget receive expose events
-    m_refGdkSurface->set_user_data(gobj());
+    // Make the widget receive expose events
+    register_surface(m_refGdkSurface);
   }
 
   //Call base class:
diff --git a/examples/book/headerbar/examplewindow.cc b/examples/book/headerbar/examplewindow.cc
index 7ff158b..a3755e2 100644
--- a/examples/book/headerbar/examplewindow.cc
+++ b/examples/book/headerbar/examplewindow.cc
@@ -31,12 +31,12 @@ ExampleWindow::ExampleWindow()
   // Entries
   m_title_entry.set_text("HeaderBar title");
   m_subtitle_entry.set_text("HeaderBar subtitle");
-  m_title_entry.signal_activate().connect(sigc::mem_fun(*this, &ExampleWindow::on_title_entry_activate));
-  m_subtitle_entry.signal_activate().connect(sigc::mem_fun(*this, 
&ExampleWindow::on_subtitle_entry_activate));
+  m_title_entry.signal_changed().connect(sigc::mem_fun(*this, &ExampleWindow::on_title_entry_changed));
+  m_subtitle_entry.signal_changed().connect(sigc::mem_fun(*this, &ExampleWindow::on_subtitle_entry_changed));
 
   // Header bar
-  on_title_entry_activate();
-  on_subtitle_entry_activate();
+  on_title_entry_changed();
+  on_subtitle_entry_changed();
   m_header_bar.set_show_title_buttons();
   m_header_bar.pack_start(m_button);
 
@@ -70,7 +70,7 @@ void ExampleWindow::on_switch_active_changed()
   m_header_bar.set_show_title_buttons(show_title_buttons);
 }
 
-void ExampleWindow::on_title_entry_activate()
+void ExampleWindow::on_title_entry_changed()
 {
   const auto title = m_title_entry.get_text();
   if(!title.empty())
@@ -79,7 +79,7 @@ void ExampleWindow::on_title_entry_activate()
   }
 }
 
-void ExampleWindow::on_subtitle_entry_activate()
+void ExampleWindow::on_subtitle_entry_changed()
 {
   const auto subtitle = m_subtitle_entry.get_text();
   m_header_bar.set_subtitle(subtitle);
diff --git a/examples/book/headerbar/examplewindow.h b/examples/book/headerbar/examplewindow.h
index ecbcc0b..9e8da46 100644
--- a/examples/book/headerbar/examplewindow.h
+++ b/examples/book/headerbar/examplewindow.h
@@ -26,10 +26,10 @@ public:
   virtual ~ExampleWindow();
 
 protected:
-  // Slots
+  // Signal handlers
   void on_switch_active_changed();
-  void on_title_entry_activate();
-  void on_subtitle_entry_activate();
+  void on_title_entry_changed();
+  void on_subtitle_entry_changed();
   void on_button_clicked();
 
   // Containers
diff --git a/examples/others/cellrenderercustom/popupentry.cc 
b/examples/others/cellrenderercustom/popupentry.cc
index 5632e43..28fba08 100644
--- a/examples/others/cellrenderercustom/popupentry.cc
+++ b/examples/others/cellrenderercustom/popupentry.cc
@@ -141,7 +141,8 @@ void PopupEntry::start_editing_vfunc(const Glib::RefPtr<const Gdk::Event>&)
   entry_->select_region(0, -1);
 
   // Although this is a key-binding signal, it's acceptable to use it in applications.
-  entry_->signal_activate().connect(sigc::mem_fun(*this, &Self::on_entry_activate));
+  // 2019-03-07: No longer true in gtk4.
+  //entry_->signal_activate().connect(sigc::mem_fun(*this, &Self::on_entry_activate));
 
   auto controller = Gtk::EventControllerKey::create();
   controller->signal_key_pressed().connect(


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