Mercurial > hg > xemacs-beta

diff src/frame-gtk.c @ 2054:91d4c8c65a0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-05-02 04:06:51 by malcolmp] Fix warnings and errors when building GTK using C++ and --use-union-type.
author malcolmp
date Sun, 02 May 2004 04:07:01 +0000
parents a8d8f419b459
children 95fee4a1420e
line wrap: on
line diff
--- a/src/frame-gtk.c	Sat May 01 21:50:40 2004 +0000
+++ b/src/frame-gtk.c	Sun May 02 04:07:01 2004 +0000
@@ -344,13 +344,12 @@
 {
   GtkWidget *shell = FRAME_GTK_SHELL_WIDGET (f);
   GdkGeometry geometry;
-  GdkWindowHints geometry_mask = 0x00;
 
   if (GTK_IS_WINDOW (shell))
     {
+      GdkWindowHints geometry_mask = GDK_HINT_RESIZE_INC;
       /* Deal with the cell size */
       default_face_height_and_width (wrap_frame (f), &geometry.height_inc, &geometry.width_inc);
-      geometry_mask |= GDK_HINT_RESIZE_INC;
 
       gtk_window_set_geometry_hints (GTK_WINDOW (shell),
 				     FRAME_GTK_TEXT_WIDGET (f), &geometry, geometry_mask);
@@ -599,7 +598,7 @@
 
   if (STRINGP (Vgtk_initial_geometry))
     {
-      if (!gnome_parse_geometry (XSTRING_DATA (Vgtk_initial_geometry), &x,&y,&w,&h))
+      if (!gnome_parse_geometry ((char*) XSTRING_DATA (Vgtk_initial_geometry), &x,&y,&w,&h))
 	{
 	  x = y = 10;
 	  w = 80;
@@ -1084,8 +1083,8 @@
 static Lisp_Object
 gtk_get_frame_parent (struct frame *f)
 {
-    GtkWidget *parentwid = gtk_object_get_data (GTK_OBJECT (FRAME_GTK_SHELL_WIDGET (f)),
-						TRANSIENT_DATA_IDENTIFIER);
+  GtkWidget *parentwid = (GtkWidget*) gtk_object_get_data (GTK_OBJECT (FRAME_GTK_SHELL_WIDGET (f)),
+							   TRANSIENT_DATA_IDENTIFIER);
 
     /* find the frame whose wid is parentwid */
     if (parentwid)
@@ -1137,13 +1136,13 @@
 {
   GtkWidget *shell = FRAME_GTK_SHELL_WIDGET (f);
   GdkGeometry geometry;
-  GdkWindowHints geometry_mask = 0x00;
 
   if (GTK_IS_WINDOW (shell))
     {
+      GdkWindowHints geometry_mask = GDK_HINT_RESIZE_INC;
+
       /* Update the cell size */
       default_face_height_and_width (wrap_frame (f), &geometry.height_inc, &geometry.width_inc);
-      geometry_mask |= GDK_HINT_RESIZE_INC;
 
       gtk_window_set_geometry_hints (GTK_WINDOW (shell),
 				     FRAME_GTK_TEXT_WIDGET (f), &geometry, geometry_mask);