[gtkmm] Gtk::FileChooserButton, FontButton: Inherit from Widget



commit befd261cf9bcf5b9c4da46ae2de6101b3a329474
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Jul 24 10:25:27 2017 +0200

    Gtk::FileChooserButton, FontButton: Inherit from Widget
    
    The corresponding gtk+ classes now inherit from GtkWidget.

 gtk/src/filechooserbutton.hg |    9 +++++----
 gtk/src/fontbutton.hg        |    8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/gtk/src/filechooserbutton.hg b/gtk/src/filechooserbutton.hg
index 373edb4..d5b6820 100644
--- a/gtk/src/filechooserbutton.hg
+++ b/gtk/src/filechooserbutton.hg
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gtkmm/box.h>
+#include <gtkmm/widget.h>
 #include <gtkmm/filechooserdialog.h>
 
 _DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/box_p.h)
+_PINCLUDE(gtkmm/private/widget_p.h)
 
 namespace Gtk
 {
@@ -43,10 +43,10 @@ namespace Gtk
  * @ingroup Widgets
  */
 class FileChooserButton
-  : public Box,
+  : public Widget,
     public FileChooser
 {
-  _CLASS_GTKOBJECT(FileChooserButton, GtkFileChooserButton, GTK_FILE_CHOOSER_BUTTON, Gtk::Box, GtkBox)
+  _CLASS_GTKOBJECT(FileChooserButton, GtkFileChooserButton, GTK_FILE_CHOOSER_BUTTON, Gtk::Widget, GtkWidget)
   _IMPLEMENTS_INTERFACE(FileChooser)
 public:
 
@@ -79,6 +79,7 @@ public:
   _WRAP_SIGNAL(void file_set(), "file-set")
 
   //_WRAP_PROPERTY("dialog", FileChooserDialog*) //construct-only
+  _IGNORE_PROPERTY("dialog")
 
   _WRAP_PROPERTY("title", Glib::ustring)
   _WRAP_PROPERTY("width-chars", int)
diff --git a/gtk/src/fontbutton.hg b/gtk/src/fontbutton.hg
index 6b1a80f..75fcbee 100644
--- a/gtk/src/fontbutton.hg
+++ b/gtk/src/fontbutton.hg
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gtkmm/button.h>
+#include <gtkmm/widget.h>
 #include <gtkmm/fontchooser.h>
 
 _DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/button_p.h)
+_PINCLUDE(gtkmm/private/widget_p.h)
 
 
 namespace Gtk
@@ -38,10 +38,10 @@ namespace Gtk
  * @ingroup Widgets
  */
 class FontButton
-  : public Button,
+  : public Widget,
     public FontChooser
 {
-  _CLASS_GTKOBJECT(FontButton, GtkFontButton, GTK_FONT_BUTTON, Gtk::Button, GtkButton)
+  _CLASS_GTKOBJECT(FontButton, GtkFontButton, GTK_FONT_BUTTON, Gtk::Widget, GtkWidget)
   _IMPLEMENTS_INTERFACE(FontChooser)
 public:
   _CTOR_DEFAULT()


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