From aad0e57f8c259a0899f8975f3bf13ce9d5149c3b Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Sun, 5 Feb 2017 12:53:37 -0700 Subject: [PATCH] gtk: Remove deprecated gtk-window-parse-geometry. --- src/gtk/Includes/gtkwindow.cdecl | 7 +------ src/gtk/gtk-widget.scm | 7 ------- src/gtk/gtk.pkg | 1 - src/gtk/gtkio.c | 2 +- src/gtk/mit-scheme-pucked-gtk.texi | 13 ------------- 5 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/gtk/Includes/gtkwindow.cdecl b/src/gtk/Includes/gtkwindow.cdecl index 795f530aa..da4f54142 100644 --- a/src/gtk/Includes/gtkwindow.cdecl +++ b/src/gtk/Includes/gtkwindow.cdecl @@ -57,9 +57,4 @@ gtk-2.0/gtk/gtkwindow.h |# gtk_window_resize (window (* GtkWindow)) (width gint) - (height gint)) - -(extern gboolean - gtk_window_parse_geometry - (window (* GtkWindow)) - (geometry (* (const gchar)))) \ No newline at end of file + (height gint)) \ No newline at end of file diff --git a/src/gtk/gtk-widget.scm b/src/gtk/gtk-widget.scm index fc3813221..133571bd0 100644 --- a/src/gtk/gtk-widget.scm +++ b/src/gtk/gtk-widget.scm @@ -1002,13 +1002,6 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. geometry mask) (free geometry))) -(define (gtk-window-parse-geometry window geometry) - (guarantee-gtk-window window 'gtk-window-parse-geometry) - (guarantee-string geometry 'gtk-window-parse-geometry) - (if (fix:zero? (C-call "gtk_window_parse_geometry" - (gobject-alien window) geometry)) - (error "Could not parse geometry string:" geometry))) - (define (gtk-window-resize window width height) (guarantee-gtk-window window 'gtk-window-resize) (guarantee-positive-fixnum width 'gtk-window-resize) diff --git a/src/gtk/gtk.pkg b/src/gtk/gtk.pkg index da1fa51c8..cb1b4770c 100644 --- a/src/gtk/gtk.pkg +++ b/src/gtk/gtk.pkg @@ -116,7 +116,6 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. gtk-window-set-title gtk-window-set-type-hint gtk-window-set-default-size gtk-window-get-default-size - gtk-window-parse-geometry gtk-window-resize gtk-window-present set-gtk-window-delete-event-callback! diff --git a/src/gtk/gtkio.c b/src/gtk/gtkio.c index e045d1a1c..fe2acbc3d 100644 --- a/src/gtk/gtkio.c +++ b/src/gtk/gtkio.c @@ -85,7 +85,7 @@ open_slice_window (void) gtk_window_set_type_hint (GTK_WINDOW (slice_window), GDK_WINDOW_TYPE_HINT_UTILITY); gtk_widget_show_all (slice_window); - gtk_window_parse_geometry (GTK_WINDOW (slice_window), "-0-0"); + /* gtk_window_parse_geometry (GTK_WINDOW (slice_window), "-0-0"); */ slice_hook = >k_slice_hook; } diff --git a/src/gtk/mit-scheme-pucked-gtk.texi b/src/gtk/mit-scheme-pucked-gtk.texi index 02259293c..19e7afe4f 100644 --- a/src/gtk/mit-scheme-pucked-gtk.texi +++ b/src/gtk/mit-scheme-pucked-gtk.texi @@ -898,19 +898,6 @@ A window that is used to implement a DND cursor. Applies @var{receiver} to @var{window}'s default width and height. @end deffn -@deffn Procedure gtk-window-parse-geometry window string -Returns @code{#f} if @var{string} is not a standard X geometry string. -Otherwise returns @code{#t} and sets @var{window}'s user-requested size -and/or position. An X geometry string is something like -@code{-0+0}, meaning ``upper right hand corner''. The X manpage -contains the full details. Note that for this procedure to work -correctly (so that @var{window} is created at its final size and -position --- no moving, resizing, etc.) the window should have any -geometry hints already set, and a final size already determined by -``showing'' the toplevel widget. -@xref{gtk-window-set-geometry-hints}. -@end deffn - @deffn Procedure gtk-window-resize window width height Resizes @var{window} as if the user had done so, obeying geometry constraints. @var{width} and @var{height} should be positive fixnums. -- 2.25.1