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



commit 541cba15cd4c45c4e33ffd9ad4ce177d91e2314b
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Sun Apr 7 16:17:04 2019 +0200

    examples: Update for the latest gtkmm-4
    
    * examples/book/searchbar/examplewindow.[cc|h]:
    Use Gtk::SearchBar::set_key_capture_widget() instead of the removed
    Gtk::SearchBar::handle_event().
    * examples/others/cellrenderercustom/cellrendererpopup.cc:
    * examples/others/cellrenderercustom/popupentry.cc: Don't call the removed
    Gtk::Window::move().

 examples/book/searchbar/examplewindow.cc                | 17 +++--------------
 examples/book/searchbar/examplewindow.h                 |  5 +----
 examples/others/cellrenderercustom/cellrendererpopup.cc |  8 ++++++--
 examples/others/cellrenderercustom/popupentry.cc        |  2 +-
 4 files changed, 11 insertions(+), 21 deletions(-)
---
diff --git a/examples/book/searchbar/examplewindow.cc b/examples/book/searchbar/examplewindow.cc
index a36a725..ddf4b0c 100644
--- a/examples/book/searchbar/examplewindow.cc
+++ b/examples/book/searchbar/examplewindow.cc
@@ -34,11 +34,10 @@ ExampleWindow::ExampleWindow()
   // Connect search entry
   m_search_bar.connect_entry(m_entry);
 
+  // Hook the search bar to key presses.
+  m_search_bar.set_key_capture_widget(*this);
+
   // Connect signals
-  auto controller = Gtk::EventControllerKey::create();
-  controller->signal_key_pressed().connect(
-    sigc::mem_fun(*this, &ExampleWindow::on_window_key_pressed), true);
-  add_controller(controller);
   m_search_bar.property_search_mode_enabled().signal_changed().connect(
     sigc::mem_fun(*this, &ExampleWindow::on_search_bar_reveal_changed));
 
@@ -90,15 +89,6 @@ ExampleWindow::~ExampleWindow()
 {
 }
 
-bool ExampleWindow::on_window_key_pressed(guint, guint, Gdk::ModifierType)
-{
-  Glib::RefPtr<Gdk::Event> current_event = Glib::wrap(gtk_get_current_event());
-  if (current_event->get_event_type() == Gdk::Event::Type::KEY_PRESS)
-    return m_search_bar.handle_event(std::static_pointer_cast<Gdk::EventKey>(current_event));
-  else
-    return false;
-}
-
 void ExampleWindow::on_search_bar_reveal_changed()
 {
   const bool revealed = m_search_bar.get_search_mode();
@@ -116,4 +106,3 @@ void ExampleWindow::on_show_close_button_changed()
   const bool show_close_button = m_close_button_switch.get_active();
   m_search_bar.set_show_close_button(show_close_button);
 }
-
diff --git a/examples/book/searchbar/examplewindow.h b/examples/book/searchbar/examplewindow.h
index 57ab244..bcf9607 100644
--- a/examples/book/searchbar/examplewindow.h
+++ b/examples/book/searchbar/examplewindow.h
@@ -26,8 +26,7 @@ public:
   virtual ~ExampleWindow();
 
 private:
-  // Slots
-  bool on_window_key_pressed(guint keyval, guint keycode, Gdk::ModifierType state);
+  // Signal handlers
   void on_search_mode_changed();
   void on_show_close_button_changed();
   void on_search_bar_reveal_changed();
@@ -49,8 +48,6 @@ private:
   Gtk::Switch m_close_button_switch;
   Gtk::Label m_close_button_label;
   Gtk::Separator m_separator;
-
 };
 
 #endif // GTKMM_EXAMPLEWINDOW_H
-
diff --git a/examples/others/cellrenderercustom/cellrendererpopup.cc 
b/examples/others/cellrenderercustom/cellrendererpopup.cc
index 7aeff40..9142f5c 100644
--- a/examples/others/cellrenderercustom/cellrendererpopup.cc
+++ b/examples/others/cellrenderercustom/cellrendererpopup.cc
@@ -165,7 +165,10 @@ void CellRendererPopup::on_show_popup(const Glib::ustring&, int, int y1, int x2,
 {
   // I'm not sure this is ok to do, but we need to show the window to be
   // able to get the allocation right.
-  popup_window_.move(-500, -500);
+  // 2019-04-07: gtk_window_move() and Gtk::Window::move() have been removed.
+  // Use set_position() for the time being.
+  //popup_window_.move(-500, -500);
+  popup_window_.set_position(Gtk::WindowPosition::MOUSE);
   popup_window_.show();
 
   const auto alloc = popup_window_.get_allocation();
@@ -204,7 +207,8 @@ void CellRendererPopup::on_show_popup(const Glib::ustring&, int, int y1, int x2,
 
   popup_window_.add_modal_grab();
 
-  popup_window_.move(x, y);
+  //popup_window_.move(x, y);
+  (void)x; (void)y; // Pretend that x and y are used.
   popup_window_.show();
 
   shown_ = true;
diff --git a/examples/others/cellrenderercustom/popupentry.cc 
b/examples/others/cellrenderercustom/popupentry.cc
index 28fba08..9afebad 100644
--- a/examples/others/cellrenderercustom/popupentry.cc
+++ b/examples/others/cellrenderercustom/popupentry.cc
@@ -85,7 +85,7 @@ int PopupEntry::get_button_width()
   button->set_image_from_icon_name("pan-down-symbolic", Gtk::IconSize::INHERIT, true);
 
   // Urgh.  Hackish :/
-  window.move(-500, -500);
+  //window.move(-500, -500);
 
   //TODO: Support natural-size:
   Gtk::Requisition requisition_min, requisition_natural;


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