[gtkmm] Gtk::ColorButton, Statusbar: Inherit from Widget



commit b6b81554047f2f0750fc55c52abc6c729cfa8db5
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Fri Jul 21 17:02:52 2017 +0200

    Gtk::ColorButton, Statusbar: Inherit from Widget
    
    The corresponding gtk+ classes now inherit from GtkWidget.

 gtk/src/colorbutton.hg |   13 ++++---------
 gtk/src/statusbar.hg   |    8 ++++----
 2 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/gtk/src/colorbutton.hg b/gtk/src/colorbutton.hg
index 39215b3..33c0939 100644
--- a/gtk/src/colorbutton.hg
+++ b/gtk/src/colorbutton.hg
@@ -16,16 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gtkmm/button.h>
+#include <gtkmm/widget.h>
 #include <gtkmm/colorchooser.h>
 #include <gdkmm/rgba.h>
 _DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/button_p.h)
-
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef GTK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
+_PINCLUDE(gtkmm/private/widget_p.h)
 
 namespace Gtk
 {
@@ -42,10 +37,10 @@ namespace Gtk
  * @ingroup Widgets
  */
 class ColorButton
-: public Button,
+: public Widget,
   public ColorChooser
 {
-  _CLASS_GTKOBJECT(ColorButton, GtkColorButton, GTK_COLOR_BUTTON, Gtk::Button, GtkButton)
+  _CLASS_GTKOBJECT(ColorButton, GtkColorButton, GTK_COLOR_BUTTON, Gtk::Widget, GtkWidget)
   _IMPLEMENTS_INTERFACE(ColorChooser)
 public:
 
diff --git a/gtk/src/statusbar.hg b/gtk/src/statusbar.hg
index 42db2f6..972ee52 100644
--- a/gtk/src/statusbar.hg
+++ b/gtk/src/statusbar.hg
@@ -16,10 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gtkmm/box.h>
+#include <gtkmm/widget.h>
 
 _DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/box_p.h)
+_PINCLUDE(gtkmm/private/widget_p.h)
 
 namespace Gtk
 {
@@ -37,9 +37,9 @@ namespace Gtk
  *
  * @ingroup Widgets
  */
-class Statusbar : public Box
+class Statusbar : public Widget
 {
-  _CLASS_GTKOBJECT(Statusbar,GtkStatusbar,GTK_STATUSBAR,Gtk::Box,GtkBox)
+  _CLASS_GTKOBJECT(Statusbar, GtkStatusbar, GTK_STATUSBAR, Gtk::Widget, GtkWidget)
   _IGNORE(gtk_statusbar_push)
 public:
   _CTOR_DEFAULT


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