[gtkmm/surface-state-rework: 1/2] Gdk, Gtk: Update for the latest gtk4




commit 0816d3c25da8ef103562113f75009b6ba8052bc4
Author: Andreas Persson <andreasp56 outlook com>
Date:   Sat Dec 12 15:11:41 2020 +0100

    Gdk, Gtk: Update for the latest gtk4
    
    Minor changes related to surface state and geometry.

 gdk/src/event.hg        |  1 -
 gdk/src/popup.hg        |  3 ---
 gdk/src/surface.hg      |  5 ++---
 gdk/src/toplevel.hg     |  2 +-
 gdk/src/toplevelsize.hg |  1 +
 gtk/src/native.hg       |  4 ++--
 gtk/src/popover.hg      |  6 ++++--
 gtk/src/window.hg       | 10 ++++------
 8 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/gdk/src/event.hg b/gdk/src/event.hg
index 295b94fd..4f5cfac3 100644
--- a/gdk/src/event.hg
+++ b/gdk/src/event.hg
@@ -119,7 +119,6 @@ public:
   _WRAP_METHOD(CrossingMode get_crossing_mode() const, gdk_crossing_event_get_mode)
   _WRAP_METHOD(NotifyType get_crossing_detail() const, gdk_crossing_event_get_detail)
   _WRAP_METHOD(bool get_crossing_focus() const, gdk_crossing_event_get_focus)
-  _WRAP_METHOD(void get_configure_size(int& width, int& height) const, gdk_configure_event_get_size)
   _WRAP_METHOD(TouchpadGesturePhase get_touchpad_gesture_phase() const, gdk_touchpad_event_get_gesture_phase)
   _WRAP_METHOD(guint get_touchpad_n_fingers() const, gdk_touchpad_event_get_n_fingers)
   _WRAP_METHOD(void get_touchpad_deltas(double& dx, double& dy) const, gdk_touchpad_event_get_deltas)
diff --git a/gdk/src/popup.hg b/gdk/src/popup.hg
index 0f4fbade..534d2732 100644
--- a/gdk/src/popup.hg
+++ b/gdk/src/popup.hg
@@ -60,9 +60,6 @@ public:
   _WRAP_METHOD(int get_position_y() const, gdk_popup_get_position_y)
   _WRAP_METHOD(bool get_autohide() const, gdk_popup_get_autohide)
 
-  // no_default_handler because the wrapped C signal has no default handlers.
-  _WRAP_SIGNAL(void popup_layout_changed(), "popup-layout-changed", no_default_handler)
-
   _WRAP_PROPERTY("parent", Glib::RefPtr<Surface>)
   _WRAP_PROPERTY("autohide", bool)
 };
diff --git a/gdk/src/surface.hg b/gdk/src/surface.hg
index 47f7ffda..4532e97a 100644
--- a/gdk/src/surface.hg
+++ b/gdk/src/surface.hg
@@ -142,14 +142,13 @@ public:
     const Glib::RefPtr<ContentProvider>& content, DragAction actions, double dx, double dy), gdk_drag_begin)
 
   _WRAP_METHOD(void queue_render(), gdk_surface_queue_render)
+  _WRAP_METHOD(void request_layout(), gdk_surface_request_layout)
 
   _WRAP_METHOD(Glib::RefPtr<FrameClock> get_frame_clock(), gdk_surface_get_frame_clock, refreturn, newin 
"3,24")
   _WRAP_METHOD(Glib::RefPtr<const FrameClock> get_frame_clock() const, gdk_surface_get_frame_clock, 
refreturn, constversion, newin "3,24")
 
   _WRAP_METHOD(void set_opaque_region(const ::Cairo::RefPtr<const ::Cairo::Region>& region), 
gdk_surface_set_opaque_region)
 
-  _WRAP_METHOD(void set_shadow_width(int left, int right, int top, int bottom), gdk_surface_set_shadow_width)
-
   /** Creates a new GLContext matching the framebuffer format to the visual of the
    * Surface. The context is disconnected from any particular surface.
    *
@@ -169,7 +168,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Gdk::CairoContext> create_cairo_context(), gdk_surface_create_cairo_context)
 
   // no_default_handler because the wrapped C signals have no default handlers.
-  _WRAP_SIGNAL(void size_changed(int width, int height), "size-changed", no_default_handler)
+  _WRAP_SIGNAL(void layout(int width, int height), "layout", no_default_handler)
 #m4 _CONVERSION(`CairoRegion*',`const ::Cairo::RefPtr<const ::Cairo::Region>&',`Gdk::Cairo::wrap($3)')
   _WRAP_SIGNAL(bool render(const ::Cairo::RefPtr<const ::Cairo::Region>& expose_region),
     "render", no_default_handler)
diff --git a/gdk/src/toplevel.hg b/gdk/src/toplevel.hg
index 6e8106cc..c41bfc4c 100644
--- a/gdk/src/toplevel.hg
+++ b/gdk/src/toplevel.hg
@@ -60,7 +60,7 @@ class GDKMM_API Toplevel : public Glib::Interface
 public:
   _WRAP_ENUM(State, GdkToplevelState, decl_prefix GDKMM_API)
 
-  _WRAP_METHOD(bool present(const Glib::RefPtr<ToplevelLayout>& layout),
+  _WRAP_METHOD(void present(const Glib::RefPtr<ToplevelLayout>& layout),
     gdk_toplevel_present)
   _WRAP_METHOD(bool minimize(), gdk_toplevel_minimize)
   _WRAP_METHOD(bool lower(), gdk_toplevel_lower)
diff --git a/gdk/src/toplevelsize.hg b/gdk/src/toplevelsize.hg
index f55d991f..160c5107 100644
--- a/gdk/src/toplevelsize.hg
+++ b/gdk/src/toplevelsize.hg
@@ -67,6 +67,7 @@ public:
     gdk_toplevel_size_get_bounds)
   _WRAP_METHOD(void set_size(int width, int height), gdk_toplevel_size_set_size)
   _WRAP_METHOD(void set_min_size(int min_width, int min_height), gdk_toplevel_size_set_min_size)
+  _WRAP_METHOD(void set_shadow_width(int left, int right, int top, int bottom), 
gdk_toplevel_size_set_shadow_width)
 
 protected:
   // The Gdk::ToplevelSize instance does not own the wrapped GdkToplevelSize instance.
diff --git a/gtk/src/native.hg b/gtk/src/native.hg
index 2b32771e..d18e5891 100644
--- a/gtk/src/native.hg
+++ b/gtk/src/native.hg
@@ -53,11 +53,11 @@ class GTKMM_API Native : public Glib::Interface
   _CLASS_INTERFACE(Native, GtkNative, GTK_NATIVE, GtkNativeInterface, , , GTKMM_API)
 
 public:
+  _WRAP_METHOD(void realize(), gtk_native_realize)
+  _WRAP_METHOD(void unrealize(), gtk_native_unrealize)
   _WRAP_METHOD(static Native* get_for_surface(const Glib::RefPtr<const Gdk::Surface>& surface),
     gtk_native_get_for_surface)
 
-  _WRAP_METHOD(void check_resize(), gtk_native_check_resize)
-
   _WRAP_METHOD(Glib::RefPtr<Gdk::Surface> get_surface(), gtk_native_get_surface, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Surface> get_surface() const, gtk_native_get_surface, refreturn, 
constversion)
 
diff --git a/gtk/src/popover.hg b/gtk/src/popover.hg
index f033fb30..ce512bea 100644
--- a/gtk/src/popover.hg
+++ b/gtk/src/popover.hg
@@ -78,8 +78,6 @@ public:
   _WRAP_METHOD(void set_mnemonics_visible(bool mnemonics_visible = true), gtk_popover_set_mnemonics_visible)
   _WRAP_METHOD(bool get_mnemonics_visible() const, gtk_popover_get_mnemonics_visible)
 
-  _WRAP_METHOD(void set_default_widget(Widget& widget), gtk_popover_set_default_widget)
-
   _WRAP_METHOD(void popup(), gtk_popover_popup)
   _WRAP_METHOD(void popdown(), gtk_popover_popdown)
 
@@ -89,6 +87,10 @@ public:
   _WRAP_METHOD(void set_cascade_popdown(bool cascade_popdown = true), gtk_popover_set_cascade_popdown)
   _WRAP_METHOD(bool get_cascade_popdown() const, gtk_popover_get_cascade_popdown)
 
+  _WRAP_METHOD(void set_default_widget(Widget& widget), gtk_popover_set_default_widget)
+
+  _WRAP_METHOD(void present(), gtk_popover_present)
+
   _WRAP_PROPERTY("pointing-to", Gdk::Rectangle)
   _WRAP_PROPERTY("position", PositionType)
   _WRAP_PROPERTY("autohide", bool)
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index 2416de6f..71e0bdcb 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -99,7 +99,8 @@ public:
   _WRAP_PROPERTY("deletable", bool)
   _WRAP_PROPERTY("application", Glib::RefPtr<Application>)
   _WRAP_PROPERTY("focus-visible", bool)
-  _WRAP_PROPERTY("is-maximized", bool)
+  _WRAP_PROPERTY("maximized", bool)
+  _WRAP_PROPERTY("fullscreened", bool)
   _WRAP_PROPERTY("default-widget", Widget*)
   _WRAP_PROPERTY("focus-widget", Widget*)
   _WRAP_PROPERTY("child", Widget*)
@@ -217,11 +218,6 @@ dnl
   _WRAP_METHOD(void get_default_size(int& width, int& height) const,
                gtk_window_get_default_size)
 
-  _WRAP_METHOD(void resize(int width, int height), gtk_window_resize)
-
-  _WRAP_METHOD(void get_size(int& width, int& height) const,
-               gtk_window_get_size)
-
   _WRAP_METHOD(Glib::RefPtr<WindowGroup> get_group(), gtk_window_get_group, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const WindowGroup> get_group() const, gtk_window_get_group, refreturn, 
constversion)
 
@@ -271,6 +267,8 @@ dnl
 
   _WRAP_METHOD(bool is_maximized() const, gtk_window_is_maximized)
 
+  _WRAP_METHOD(bool is_fullscreen() const, gtk_window_is_fullscreen)
+
   // from gtk/gtkshow.h:
   //TODO: _WRAP_METHOD(void show_uri(const Glib::ustring& uri, guint32 timestamp), gtk_show_uri)
   // gtk_show_uri_full[_finish]()


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