GNOME.org
 

[gtkmm] Gdk, Gtk: Update for the latest gtk4 (remove application menus, etc.)

commit 91d24aedee2cdae2170bd7779636da4f52efa919
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Wed May 27 15:26:26 2020 +0200

    Gdk, Gtk: Update for the latest gtk4 (remove application menus, etc.)
    
    Remove Gtk::Application::set_app_menu() and other app_menu methods.
    
    Gtk::Window_Class::dispose_vfunv_callback(): Call gtk_widget_hide() and
    Gtk::Window::on_window_hide().
    
    Other changes.

 demos/gtk-demo/example_colorsel.cc    |  1 +
 demos/gtk-demo/example_dialog.cc      |  1 -
 demos/gtk-demo/example_iconbrowser.cc |  6 ++--
 gdk/src/device.hg                     |  1 -
 gdk/src/display.ccg                   |  1 +
 gdk/src/display.hg                    | 17 +++++-----
 gdk/src/surface.ccg                   |  1 -
 gdk/src/surface.hg                    |  8 +----
 gdk/src/toplevel.hg                   |  5 +++
 gdk/src/types.hg                      |  3 --
 gtk/src/application.hg                | 26 ++++-----------
 gtk/src/colorchooserdialog.hg         |  3 +-
 gtk/src/fixed.hg                      |  6 ++--
 gtk/src/native.hg                     |  3 +-
 gtk/src/widget.hg                     |  4 +--
 gtk/src/window.ccg                    | 63 +++++++++++++----------------------
 tools/m4/convert_gdk.m4               |  3 --
 17 files changed, 59 insertions(+), 93 deletions(-)
---
diff --git a/demos/gtk-demo/example_colorsel.cc b/demos/gtk-demo/example_colorsel.cc
index 7d4ea453..7c690b89 100644
--- a/demos/gtk-demo/example_colorsel.cc
+++ b/demos/gtk-demo/example_colorsel.cc
@@ -77,6 +77,7 @@ void Example_ColorSel::on_button_clicked()
   {
     m_pDialog.reset(new Gtk::ColorChooserDialog("Changing color"));
     m_pDialog->set_transient_for(*this);
+    m_pDialog->set_hide_on_close(true);
     m_pDialog->set_modal(true);
     m_pDialog->signal_response().connect(
       sigc::mem_fun(*this, &Example_ColorSel::on_dialog_response));
diff --git a/demos/gtk-demo/example_dialog.cc b/demos/gtk-demo/example_dialog.cc
index 6a887fa4..d1eee62c 100644
--- a/demos/gtk-demo/example_dialog.cc
+++ b/demos/gtk-demo/example_dialog.cc
@@ -130,7 +130,6 @@ void Example_Dialog::on_button_interactive()
   pDialog->signal_response().connect(sigc::bind(
     sigc::mem_fun(*this, &Example_Dialog::on_interactive_response), pDialog));
   pDialog->show();
-
 }
 
 void Example_Dialog::on_message_response(int /* response_id */, Gtk::MessageDialog* dialog)
diff --git a/demos/gtk-demo/example_iconbrowser.cc b/demos/gtk-demo/example_iconbrowser.cc
index 53fac7c1..4ae3de27 100644
--- a/demos/gtk-demo/example_iconbrowser.cc
+++ b/demos/gtk-demo/example_iconbrowser.cc
@@ -893,11 +893,11 @@ const int DetailDialog::m_icon_size[n_icon_sizes] = { 16, 24, 32, 48, 64 };
 
 // Definition of detail dialog methods.
 DetailDialog::DetailDialog(Gtk::Window& parent)
-: Gtk::Dialog("", parent, true, true)
+: Gtk::Dialog("", parent, true /* modal */, true /* use_header_bar */)
 {
   set_resizable(false);
-  auto content_area = get_content_area();
-  content_area->append(m_grid);
+  set_hide_on_close();
+  get_content_area()->append(m_grid);
   m_grid.set_expand();
   m_grid.set_margin(10);
   m_grid.set_row_spacing(10);
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index 2679bafe..98c0a274 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -29,7 +29,6 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gdk
 {
 
-_WRAP_ENUM(EventMask, GdkEventMask)
 _WRAP_ENUM(InputSource, GdkInputSource)
 
 class DeviceTool;
diff --git a/gdk/src/display.ccg b/gdk/src/display.ccg
index 164f99e4..e7311073 100644
--- a/gdk/src/display.ccg
+++ b/gdk/src/display.ccg
@@ -18,6 +18,7 @@
 
 #include <vector>
 
+#include <giomm/listmodel.h>
 #include <gdkmm/applaunchcontext.h>
 #include <gdkmm/clipboard.h>
 #include <gdkmm/seat.h>
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index 70eecad9..9b5b6d24 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -25,6 +25,11 @@
 _DEFS(gdkmm,gdk)
 _PINCLUDE(glibmm/private/object_p.h)
 
+namespace Gio
+{
+class ListModel;
+}
+
 namespace Gdk
 {
 
@@ -84,7 +89,6 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Clipboard> get_primary_clipboard(), gdk_display_get_primary_clipboard, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Clipboard> get_primary_clipboard() const, 
gdk_display_get_primary_clipboard, refreturn, constversion)
 
-  _WRAP_METHOD(bool supports_shapes() const, gdk_display_supports_shapes)
   _WRAP_METHOD(bool supports_input_shapes() const, gdk_display_supports_input_shapes)
   _WRAP_METHOD(void notify_startup_complete(const Glib::ustring& startup_id), 
gdk_display_notify_startup_complete)
   _WRAP_METHOD(Glib::ustring get_startup_notification_id() const, gdk_display_get_startup_notification_id)
@@ -102,9 +106,9 @@ public:
 #m4 _CONVERSION(`GList*',`std::vector<Glib::RefPtr<const Seat>>',`Glib::ListHandler<Glib::RefPtr<const 
Seat>>::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(std::vector<Glib::RefPtr<const Seat>> list_seats() const, gdk_display_list_seats)
 
-  _WRAP_METHOD(int get_n_monitors() const, gdk_display_get_n_monitors)
-  _WRAP_METHOD(Glib::RefPtr<Monitor> get_monitor(int monitor_num), gdk_display_get_monitor, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Monitor> get_monitor(int monitor_num) const, gdk_display_get_monitor, 
refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gio::ListModel> get_monitors(), gdk_display_get_monitors, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gio::ListModel> get_monitors() const, gdk_display_get_monitors, refreturn, 
constversion)
+
   _WRAP_METHOD(Glib::RefPtr<Monitor> get_monitor_at_surface(const Glib::RefPtr<Surface>& surface), 
gdk_display_get_monitor_at_surface, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Monitor> get_monitor_at_surface(const Glib::RefPtr<Surface>& surface) 
const, gdk_display_get_monitor_at_surface, refreturn, constversion)
 
@@ -121,14 +125,11 @@ public:
   _WRAP_SIGNAL(void seat_added(const Glib::RefPtr<Seat>& seat), "seat-added", no_default_handler)
   _WRAP_SIGNAL(void seat_removed(const Glib::RefPtr<Seat>& seat), "seat-removed", no_default_handler)
 
-#m4 _CONVERSION(`GdkMonitor*',`const Glib::RefPtr<Monitor>&', Glib::wrap($3, true))
-  _WRAP_SIGNAL(void monitor_added(const Glib::RefPtr<Monitor>& monitor), "monitor-added", no_default_handler)
-  _WRAP_SIGNAL(void monitor_removed(const Glib::RefPtr<Monitor>& monitor), "monitor-removed", 
no_default_handler)
-
   _WRAP_SIGNAL(void setting_changed(const Glib::ustring& setting), "setting-changed", no_default_handler)
 
   _WRAP_PROPERTY("composited", bool)
   _WRAP_PROPERTY("rgba", bool)
+  _WRAP_PROPERTY("input-shapes", bool)
 
   // We don't wrap the vfuncs because GdkDisplayClass is private.
 };
diff --git a/gdk/src/surface.ccg b/gdk/src/surface.ccg
index 123f6005..207c8fb6 100644
--- a/gdk/src/surface.ccg
+++ b/gdk/src/surface.ccg
@@ -27,7 +27,6 @@
 #include <gdkmm/monitor.h>
 
 using State = Gdk::Surface::State;
-using TypeHint = Gdk::Surface::TypeHint;
 using CairoRegion = cairo_region_t;
 
 namespace Gdk
diff --git a/gdk/src/surface.hg b/gdk/src/surface.hg
index 8c10722e..ccead682 100644
--- a/gdk/src/surface.hg
+++ b/gdk/src/surface.hg
@@ -59,7 +59,6 @@ class Surface : public Glib::Object
 
 public:
   _WRAP_ENUM(State, GdkSurfaceState)
-  _WRAP_ENUM(TypeHint, GdkSurfaceTypeHint)
 
   // _WRAP_CREATE() would not be very useful here.
   // The gdk_surface_new_*() functions do more than call g_object_new().
@@ -77,7 +76,6 @@ public:
 
   _WRAP_METHOD(void set_input_region(const ::Cairo::RefPtr< ::Cairo::Region>& region), 
gdk_surface_set_input_region)
 
-  _WRAP_METHOD(bool is_viewable() const, gdk_surface_is_viewable)
   _WRAP_METHOD(bool get_mapped() const, gdk_surface_get_mapped)
 
   _WRAP_METHOD(void set_cursor(const Glib::RefPtr<Cursor>& cursor), gdk_surface_set_cursor)
@@ -107,12 +105,8 @@ public:
 
   _WRAP_METHOD(void beep(), gdk_surface_beep)
 
-  _WRAP_METHOD(void begin_resize_drag(SurfaceEdge edge, const Glib::RefPtr<Device>& device, int button, int 
x, int y, guint32 timestamp), gdk_surface_begin_resize_drag)
-
-  _WRAP_METHOD(void begin_move_drag(const Glib::RefPtr<Device>& device, int button, int x, int y, guint32 
timestamp), gdk_surface_begin_move_drag)
-
   _WRAP_METHOD(Glib::RefPtr<Drag> drag_begin_from_point(const Glib::RefPtr<Device>& device,
-    const Glib::RefPtr<ContentProvider>& content, DragAction actions, int dx, int dy), gdk_drag_begin)
+    const Glib::RefPtr<ContentProvider>& content, DragAction actions, double dx, double dy), gdk_drag_begin)
 
   _WRAP_METHOD(void queue_expose(), gdk_surface_queue_expose)
 
diff --git a/gdk/src/toplevel.hg b/gdk/src/toplevel.hg
index 4b0b2268..f39e1d6a 100644
--- a/gdk/src/toplevel.hg
+++ b/gdk/src/toplevel.hg
@@ -71,6 +71,11 @@ public:
     gdk_toplevel_inhibit_system_shortcuts)
   _WRAP_METHOD(void restore_system_shortcuts(), gdk_toplevel_restore_system_shortcuts)
 
+  _WRAP_METHOD(void begin_resize(SurfaceEdge edge, const Glib::RefPtr<Device>& device,
+    int button, double x, double y, guint32 timestamp), gdk_toplevel_begin_resize)
+  _WRAP_METHOD(void begin_move(const Glib::RefPtr<Device>& device, int button,
+    double x, double y, guint32 timestamp), gdk_toplevel_begin_move)
+
   _WRAP_PROPERTY("state", Surface::State)
   _WRAP_PROPERTY("title", Glib::ustring)
   _WRAP_PROPERTY("startup-id", Glib::ustring)
diff --git a/gdk/src/types.hg b/gdk/src/types.hg
index 2a876a3b..4ffe58f4 100644
--- a/gdk/src/types.hg
+++ b/gdk/src/types.hg
@@ -36,11 +36,8 @@ namespace Gdk
 
 class Window;
 
-_WRAP_ENUM(ByteOrder, GdkByteOrder)
 _WRAP_ENUM(ModifierType, GdkModifierType)
 
-typedef GdkGeometry Geometry; //It's not used enough to justify having a wrapper.
-
 /** This is a simple structure containing an x and y coordinate of a point.
  */
 class Point
diff --git a/gtk/src/application.hg b/gtk/src/application.hg
index f46aef89..6a806099 100644
--- a/gtk/src/application.hg
+++ b/gtk/src/application.hg
@@ -38,20 +38,22 @@ class Window;
 //TODO: Add overview documentation discussing the techniques show in the examples in gtkmm-docmentation.
 //TODO: Add the screenshots from the C API?
 
-/** The Gtk::Application class handles many important aspects
+/** Application class.
+ *
+ * The %Gtk::Application class handles many important aspects
  * of a GTK+ application in a convenient fashion, without enforcing
  * a one-size-fits-all application model.
  *
- * Currently, Gtk::Application handles GTK+ and gtkmm initialization, application
+ * Currently, %Gtk::Application handles GTK and gtkmm initialization, application
  * uniqueness, session management, provides some basic scriptability and
  * desktop shell integration by exporting actions and menus, and manages a
  * list of toplevel windows whose life-cycle is automatically tied to the
  * life-cycle of your application.
  *
- * While Gtk::Application works fine with plain Gtk::Window%s, it is recommended
+ * While %Gtk::Application works fine with plain Gtk::Window%s, it is recommended
  * to use it together with Gtk::ApplicationWindow.
  *
- * When GDK threads are enabled, Gtk::Application will acquire the GDK
+ * When GDK threads are enabled, %Gtk::Application will acquire the GDK
  * lock when invoking actions that arrive from other processes.  The GDK
  * lock is not touched for local action invocations.  In order to have
  * actions invoked in a predictable context it is therefore recommended
@@ -60,18 +62,12 @@ class Window;
  * associated with Gtk::ApplicationWindow and to the Gio::Application::activate() and
  * Gio::Application::open() methods.
  *
- * To set an application menu for a Gtk::Application, use
- * set_app_menu(). The Gio::MenuModel that this method
- * expects is usually constructed using Gtk::Builder.
  * To specify a menubar that will be shown by
  * Gtk::ApplicationWindow%s, use set_menubar(). Use the base
  * Gio::ActionMap interface to add actions, to respond to the user
  * selecting these menu items.
  *
- * GTK+ displays these menus as expected, depending on the platform
- * the application is running on.
- *
- * Gtk::Application optionally registers with a session manager
+ * %Gtk::Application optionally registers with a session manager
  * of the users session (if you set the register-session
  * property) and offers various functionality related to the session
  * life-cycle.
@@ -238,11 +234,6 @@ public:
    */
   int run();
 
-  _WRAP_METHOD(Glib::RefPtr<Gio::MenuModel> get_app_menu(), gtk_application_get_app_menu, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Gio::MenuModel> get_app_menu() const, gtk_application_get_app_menu, 
refreturn, constversion)
-
-  _WRAP_METHOD(void set_app_menu(const Glib::RefPtr<Gio::MenuModel>& app_menu), gtk_application_set_app_menu)
-
   _WRAP_METHOD(Glib::RefPtr<Gio::MenuModel> get_menubar(), gtk_application_get_menubar, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gio::MenuModel> get_menubar() const, gtk_application_get_menubar, 
refreturn, constversion)
 
@@ -292,12 +283,9 @@ public:
    */
   void unset_accels_for_action(const Glib::ustring& detailed_action_name);
 
-  _WRAP_METHOD(bool prefers_app_menu() const, gtk_application_prefers_app_menu)
-
   _WRAP_METHOD(Glib::RefPtr<Gio::Menu> get_menu_by_id(const Glib::ustring& id), 
gtk_application_get_menu_by_id, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gio::Menu> get_menu_by_id(const Glib::ustring& id) const, 
gtk_application_get_menu_by_id, refreturn, constversion)
 
-  _WRAP_PROPERTY("app-menu", Glib::RefPtr<Gio::MenuModel>)
   _WRAP_PROPERTY("menubar", Glib::RefPtr<Gio::MenuModel>)
   _WRAP_PROPERTY("register-session", bool)
   _WRAP_PROPERTY("screensaver-active", bool, newin "3,94")
diff --git a/gtk/src/colorchooserdialog.hg b/gtk/src/colorchooserdialog.hg
index 3f839bf9..08944113 100644
--- a/gtk/src/colorchooserdialog.hg
+++ b/gtk/src/colorchooserdialog.hg
@@ -43,7 +43,8 @@ public:
 
   explicit ColorChooserDialog(const Glib::ustring& title);
 
-  _WRAP_CTOR(ColorChooserDialog(const Glib::ustring& title, Window& parent), gtk_color_chooser_dialog_new)
+  //Note: We renamed the parent parameter to transient_for because that is the property name.
+  _WRAP_CTOR(ColorChooserDialog(const Glib::ustring& title, Window& transient_for), 
gtk_color_chooser_dialog_new)
 
   _WRAP_PROPERTY("show-editor", bool)
 };
diff --git a/gtk/src/fixed.hg b/gtk/src/fixed.hg
index 24da564e..dd146bbe 100644
--- a/gtk/src/fixed.hg
+++ b/gtk/src/fixed.hg
@@ -43,10 +43,10 @@ class Fixed : public Widget
 public:
   _CTOR_DEFAULT
 
-  _WRAP_METHOD(void put(Widget& widget, int x, int y), gtk_fixed_put)
+  _WRAP_METHOD(void put(Widget& widget, double x, double y), gtk_fixed_put)
   _WRAP_METHOD(void remove(Widget& widget), gtk_fixed_remove)
-  _WRAP_METHOD(void move(Widget& widget, int x, int y), gtk_fixed_move)
-  _WRAP_METHOD(void get_child_position(Widget& widget, int& x, int& y) const, gtk_fixed_get_child_position)
+  _WRAP_METHOD(void move(Widget& widget, double x, double y), gtk_fixed_move)
+  _WRAP_METHOD(void get_child_position(Widget& widget, double& x, double& y) const, 
gtk_fixed_get_child_position)
 };
 
 } //namespace Gtk
diff --git a/gtk/src/native.hg b/gtk/src/native.hg
index 5f347f13..0441e1ea 100644
--- a/gtk/src/native.hg
+++ b/gtk/src/native.hg
@@ -60,12 +60,13 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Surface> get_surface() const, gtk_native_get_surface, refreturn, 
constversion)
 
   //?_WRAP_METHOD(GskRenderer* get_renderer(), gtk_native_get_renderer)
+  _WRAP_METHOD(void get_surface_transform(double& x, double& y), gtk_native_get_surface_transform)
 
 protected:
 #m4 _CONVERSION(`Glib::RefPtr<Gdk::Surface>', `GdkSurface*', __CONVERT_REFPTR_TO_P)
   _WRAP_VFUNC(Glib::RefPtr<Gdk::Surface> get_surface(), "get_surface", refreturn)
   //?_WRAP_VFUNC(GskRenderer* get_renderer(), "get_renderer")
-  _WRAP_VFUNC(void get_surface_transform(int& x, int& y), "get_surface_transform")
+  _WRAP_VFUNC(void get_surface_transform(double& x, double& y), "get_surface_transform")
   _WRAP_VFUNC(void check_resize(), "check_resize")
 };
 
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index ce6e0b11..75334de6 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -302,8 +302,8 @@ public:
   _WRAP_METHOD(bool is_ancestor(Widget &ancestor) const, gtk_widget_is_ancestor)
 
   _WRAP_METHOD(bool translate_coordinates(Widget& dest_widget,
-                                              int src_x, int src_y,
-                                              int& dest_x, int& dest_y), gtk_widget_translate_coordinates)
+               double src_x, double src_y,
+               double& dest_x, double& dest_y), gtk_widget_translate_coordinates)
 
   _WRAP_METHOD(bool contains(double x, double y) const, gtk_widget_contains)
   _WRAP_METHOD(Widget* pick(double x, double y, PickFlags flags = PickFlags::DEFAULT), gtk_widget_pick)
diff --git a/gtk/src/window.ccg b/gtk/src/window.ccg
index 7693841d..e2f756bb 100644
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@ -75,9 +75,17 @@ Window::Window()
 
 void Window::on_window_hide()
 {
+  #ifdef GLIBMM_DEBUG_REFCOUNTING
+  g_warning("Gtk::Window::on_window_hide() gobject_=%p\n", (void*) gobject_);
+  #endif
+
   auto appl = get_application();
   if (appl)
   {
+    #ifdef GLIBMM_DEBUG_REFCOUNTING
+    g_warning("Gtk::Window::on_window_hide(): before remove_window().");
+    #endif
+
     // Tell GtkApplication to forget the window.
     // This can cause Application::run() to return, if it is the last window.
     // Otherwise, GtkApplication waits for the window to be _destroyed_,
@@ -143,15 +151,10 @@ void Window::_release_c_instance()
 
 void Window_Class::dispose_vfunc_callback(GObject* self)
 {
-  //Avoid disposal of Windows on delete_event (window close) signal.
-
   #ifdef GLIBMM_DEBUG_REFCOUNTING
   g_warning("Window_Class::dispose_vfunc_callback(): gobject_: %p\n", (void*)self);
   #endif
-#if 0
-  // The "dispose" vfunc in GtkWindow does much more in gtk4 than in gtk3.
-  // It would be difficult to make the deletion of windows work without letting
-  // the gtk4 dispose vfunc do its job. /Kjell 2020-05-19
+
   const auto obj = dynamic_cast<Widget*>(
       Glib::ObjectBase::_get_current_wrapper(self));
 
@@ -164,12 +167,6 @@ void Window_Class::dispose_vfunc_callback(GObject* self)
     const auto pWidget = obj->gobj();
     g_return_if_fail(pWidget == GTK_WIDGET(self));
 
-    // Abort dispose if the widget isn't managed (which a window isn't), in order
-    // to prevent the nasty self-destroying behaviour of GTK+.  This applies to:
-    //
-    // - GtkWindow, if it received "delete_event"
-    // - GtkDialog, which destroys on "response" by default
-
     #ifdef GLIBMM_DEBUG_REFCOUNTING
     g_warning("Window_Class::dispose_vfunc_callback(): before gtk_widget_hide().");
     #endif
@@ -189,40 +186,26 @@ void Window_Class::dispose_vfunc_callback(GObject* self)
     #ifdef GLIBMM_DEBUG_REFCOUNTING
     g_warning("Window_Class::dispose_vfunc_callback(): after gtk_widget_hide().");
     #endif
-
-    // GTKMM_LIFECYCLE
-    return; // Prevent calling of normal C dispose vfunc (see below)
   }
-  else
-#endif
-  {
-    #ifdef GLIBMM_DEBUG_REFCOUNTING
-    //g_warning("Window_Class::dispose_vfunc_callback(): unreferenced: before gtk_widget_hide().");
-    #endif
 
-    // Always hide widgets on object destruction, regardless of whether
-    // the widget is managed or not.  This is done for consistency so that
-    // connecting to signal_hide() is guaranteed to work.
-    //gtk_widget_hide(pWidget);
-
-    #ifdef GLIBMM_DEBUG_REFCOUNTING
-    //g_warning("Window_Class::dispose_vfunc_callback(): unreferenced:  after gtk_widget_hide().");
-    #endif
+  // The "dispose" vfunc in GtkWindow does much more in gtk4 than in gtk3.
+  // It would be difficult to make the deletion of windows work without letting
+  // the gtk4 dispose vfunc do its job. /Kjell 2020-05-19
+  // GTKMM_LIFECYCLE
 
-    const auto base = static_cast<GObjectClass*>(
-        g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)));
+  const auto base = static_cast<GObjectClass*>(
+      g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)));
 
-    #ifdef GLIBMM_DEBUG_REFCOUNTING
-    g_warning("Window_Class::dispose_vfunc_callback(): before calling base->dispose.");
-    #endif
+  #ifdef GLIBMM_DEBUG_REFCOUNTING
+  g_warning("Window_Class::dispose_vfunc_callback(): before calling base->dispose.");
+  #endif
 
-    if(base->dispose)
-      (*base->dispose)(self);
+  if(base->dispose)
+    (*base->dispose)(self);
 
-    #ifdef GLIBMM_DEBUG_REFCOUNTING
-    g_warning("Window_Class::dispose_vfunc_callback(): after calling base->dispose.");
-    #endif
-  }
+  #ifdef GLIBMM_DEBUG_REFCOUNTING
+  g_warning("Window_Class::dispose_vfunc_callback(): after calling base->dispose.");
+  #endif
 }
 
 void Window::unset_focus()
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index 51a03377..8fead3c7 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -28,7 +28,6 @@ _EQUAL(gfloat,float)
 _CONV_ENUM(Gdk,AnchorHints)
 _CONV_ENUM(Gdk,AxisFlags)
 _CONV_ENUM(Gdk,AxisUse)
-_CONV_ENUM(Gdk,ByteOrder)
 _CONV_ENUM(Gdk,CapStyle)
 _CONV_ENUM(Gdk,Colorspace)
 _CONV_ENUM(Gdk,CrossingMode)
@@ -37,7 +36,6 @@ _CONV_INCLASS_ENUM(Gdk,DevicePad,Feature)
 _CONV_INCLASS_ENUM(Gdk,DeviceTool,Type)
 _CONV_ENUM(Gdk,DragAction)
 _CONV_ENUM(Gdk,DragCancelReason)
-_CONV_ENUM(Gdk,EventMask)
 _CONV_INCLASS_ENUM(Gdk,Event,Type)
 _CONV_ENUM(Gdk,ExtensionMode)
 _CONV_ENUM(Gdk,Fill)
@@ -65,7 +63,6 @@ _CONV_ENUM(Gdk,Status)
 _CONV_ENUM(Gdk,SubpixelLayout)
 _CONV_ENUM(Gdk,SurfaceEdge)
 _CONV_INCLASS_ENUM(Gdk,Surface,State)
-_CONV_INCLASS_ENUM(Gdk,Surface,TypeHint)
 _CONV_ENUM(Gdk,TouchpadGesturePhase)
 _CONV_INCLASS_ENUM(Gdk,Pixbuf,AlphaMode)
 _CONV_INCLASS_ENUM(Gdk,Pixbuf,Rotation)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]