[gtkmm] Remove Gtk::EventBox



commit 463ab43e01ee800887ef7e2ad5b132e828e5f69e
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Sun Aug 6 15:06:36 2017 +0200

    Remove Gtk::EventBox
    
    GtkEventBox has been removed from gtk+. All widgets can receive events.

 .gitignore                                |    2 -
 demos/gtk-demo/example_iconbrowser.cc     |   14 +++-----
 gtk/gtkmm.h                               |    1 -
 gtk/src/eventbox.ccg                      |   19 -----------
 gtk/src/eventbox.hg                       |   50 -----------------------------
 gtk/src/filelist.am                       |    1 -
 gtk/src/image.hg                          |    7 +---
 tools/extra_defs_gen/generate_defs_gtk.cc |    2 +-
 8 files changed, 8 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0c3f40..f28d7d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -218,8 +218,6 @@ gtk/gtkmm/entrycompletion.cc
 gtk/gtkmm/entrycompletion.h
 gtk/gtkmm/enums.cc
 gtk/gtkmm/enums.h
-gtk/gtkmm/eventbox.cc
-gtk/gtkmm/eventbox.h
 gtk/gtkmm/eventcontroller.cc
 gtk/gtkmm/eventcontroller.h
 gtk/gtkmm/expander.cc
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index d65a816..a87d2ce 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -104,7 +104,6 @@ protected:
 
   // Child widgets:
   Gtk::Grid m_grid;
-  Gtk::EventBox m_event_box[n_icon_sizes];
   Gtk::Image m_image[n_icon_sizes];
   Gtk::Label m_label[n_icon_sizes];
   Gtk::Label m_description;
@@ -901,20 +900,19 @@ DetailDialog::DetailDialog(Gtk::Window& parent)
   m_grid.set_column_spacing(10);
   for (int i = 0; i < n_icon_sizes; ++i)
   {
-    m_grid.attach(m_event_box[i], i, 0, 1, 1);
-    m_event_box[i].add(m_image[i]);
+    m_grid.attach(m_image[i], i, 0);
     m_image[i].property_margin() = 4;
     m_image[i].set_halign(Gtk::Align::CENTER);
     m_image[i].set_valign(Gtk::Align::END);
 
     // Enable dragging an image, and copying it to another program.
-    m_event_box[i].drag_source_set(
+    m_image[i].drag_source_set(
       std::vector<Gtk::TargetEntry>(), Gdk::ModifierType::BUTTON1_MASK, Gdk::DragAction::COPY);
-    m_event_box[i].drag_source_add_image_targets();
-    m_event_box[i].signal_drag_data_get().connect(
+    m_image[i].drag_source_add_image_targets();
+    m_image[i].signal_drag_data_get().connect(
       sigc::bind(sigc::mem_fun(*this, &DetailDialog::on_image_drag_data_get), i));
 
-    m_grid.attach(m_label[i], i, 1, 1, 1);
+    m_grid.attach(m_label[i], i, 1);
     m_label[i].property_margin() = 4;
     m_label[i].set_halign(Gtk::Align::CENTER);
     m_label[i].set_valign(Gtk::Align::CENTER);
@@ -942,7 +940,7 @@ void DetailDialog::set_image(
   {
     m_image[i].set_from_icon_name(icon_name, Gtk::BuiltinIconSize::MENU);
     m_image[i].set_pixel_size(m_icon_size[i]);
-    m_event_box[i].drag_source_set_icon(get_icon(i));
+    m_image[i].drag_source_set_icon(get_icon(i));
   }
   if (description.empty())
     m_description.hide();
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index f919c2d..a2ad51d 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -142,7 +142,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/entry.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/enums.h>
-#include <gtkmm/eventbox.h>
 #include <gtkmm/eventcontroller.h>
 #include <gtkmm/filechooser.h>
 #include <gtkmm/filechooserbutton.h>
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 5c93382..1841d66 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -66,7 +66,6 @@ gtkmm_files_any_hg =          \
        entrycompletion.hg      \
        entrybuffer.hg          \
        enums.hg                \
-       eventbox.hg             \
        eventcontroller.hg              \
        expander.hg             \
        filechooser.hg          \
diff --git a/gtk/src/image.hg b/gtk/src/image.hg
index 9b2beb1..a4db7f6 100644
--- a/gtk/src/image.hg
+++ b/gtk/src/image.hg
@@ -34,11 +34,6 @@ _CC_INCLUDE(gtk/gtk.h)
  * displayed as an image; most typically, you would load a Gdk::Pixbuf ("pixel
  * buffer") from a file, and then display that.
  *
- * Gtk::Image is a "no window" widget (has no Gdk::Window of its own), so by
- * default does not receive events. If you want to receive events on the
- * image, such as button clicks, place the image inside a Gtk::EventBox, then
- * connect to the event signals on the event box.
- *
  * The Image widget looks like this:
  * @image html image1.png
  *
@@ -62,7 +57,7 @@ public:
    *
    * The storage type (get_storage_type()) of the returned image is not defined. It will be whatever is 
appropriate for displaying the file.
    */
-  _WRAP_CTOR(Image(const std::string& file), gtk_image_new_from_file)
+  _WRAP_CTOR(Image(const std::string& filename), gtk_image_new_from_file)
 
   /** Creates a new Image widget displaying @a pixbuf.
    * Note that this just creates an GtkImage from the pixbuf. The Gtk::Image created will not react to state 
changes.
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index c5d0111..d9c6091 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -80,6 +80,7 @@ int main(int /* argc */, char** /* argv */)
             << get_defs( GTK_TYPE_CELL_RENDERER_PROGRESS )
             << get_defs( GTK_TYPE_CELL_RENDERER_SPIN )
             << get_defs( GTK_TYPE_CELL_RENDERER_SPINNER )
+            << get_defs( GTK_TYPE_CENTER_BOX )
             << get_defs( GTK_TYPE_CLIPBOARD )
             << get_defs( GTK_TYPE_COLOR_BUTTON )
             << get_defs( GTK_TYPE_COLOR_CHOOSER )
@@ -94,7 +95,6 @@ int main(int /* argc */, char** /* argv */)
             << get_defs( GTK_TYPE_ENTRY )
             << get_defs( GTK_TYPE_ENTRY_COMPLETION )
             << get_defs( GTK_TYPE_ENTRY_BUFFER )
-            << get_defs( GTK_TYPE_EVENT_BOX )
             << get_defs( GTK_TYPE_EVENT_CONTROLLER )
             << get_defs( GTK_TYPE_EXPANDER )
             << get_defs( GTK_TYPE_FILE_FILTER )


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