Mercurial > emacs

changeset 67528:c5c00342184b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* gtkutil.c (SSDATA): New macro to remove compiler warnings. (xg_get_image_for_pixmap, xg_create_frame_widgets) (xg_get_file_with_chooser): Use SSDATA instead of SDATA.
author Jan Djärv <jan.h.d@swipnet.se>
date Mon, 12 Dec 2005 08:08:56 +0000
parents 88807d05a058
children dcb511f8ef75
files src/gtkutil.c
diffstat 1 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkutil.c	Mon Dec 12 08:08:43 2005 +0000
+++ b/src/gtkutil.c	Mon Dec 12 08:08:56 2005 +0000
@@ -41,6 +41,9 @@
 #define FRAME_TOTAL_PIXEL_HEIGHT(f) \
   (FRAME_PIXEL_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f))
 
+/* Avoid "differ in sign" warnings */
+#define SSDATA(x)  ((char *) SDATA (x))
+
 
 /***********************************************************************
                       Display handling functions
@@ -347,9 +350,9 @@
 	    xassert (STRINGP (file) != 0);
 
 	    if (! old_widget)
-	      old_widget = GTK_IMAGE (gtk_image_new_from_file (SDATA (file)));
+	      old_widget = GTK_IMAGE (gtk_image_new_from_file (SSDATA (file)));
 	    else
-	      gtk_image_set_from_file (old_widget, SDATA (file));
+	      gtk_image_set_from_file (old_widget, SSDATA (file));
 
 	    UNGCPRO;
 	    return GTK_WIDGET (old_widget);
@@ -735,11 +738,11 @@
   /* Use same names as the Xt port does.  I.e. Emacs.pane.emacs by default */
   gtk_widget_set_name (wtop, EMACS_CLASS);
   gtk_widget_set_name (wvbox, "pane");
-  gtk_widget_set_name (wfixed, SDATA (Vx_resource_name));
+  gtk_widget_set_name (wfixed, SSDATA (Vx_resource_name));
 
   /* If this frame has a title or name, set it in the title bar.  */
-  if (! NILP (f->title)) title = SDATA (ENCODE_UTF_8 (f->title));
-  else if (! NILP (f->name)) title = SDATA (ENCODE_UTF_8 (f->name));
+  if (! NILP (f->title)) title = SSDATA (ENCODE_UTF_8 (f->title));
+  else if (! NILP (f->name)) title = SSDATA (ENCODE_UTF_8 (f->name));
 
   if (title) gtk_window_set_title (GTK_WINDOW (wtop), title);
 
@@ -780,8 +783,8 @@
      can't shrink the window from its starting size.  */
   gtk_window_set_policy (GTK_WINDOW (wtop), TRUE, TRUE, TRUE);
   gtk_window_set_wmclass (GTK_WINDOW (wtop),
-                          SDATA (Vx_resource_name),
-                          SDATA (Vx_resource_class));
+                          SSDATA (Vx_resource_name),
+                          SSDATA (Vx_resource_class));
 
   /* Add callback to do nothing on WM_DELETE_WINDOW.  The default in
      GTK is to destroy the widget.  We want Emacs to do that instead.  */
@@ -1245,7 +1248,7 @@
       if (default_filename[0] != '/')
         file = Fexpand_file_name (file, Qnil);
 
-      default_filename = SDATA (file);
+      default_filename = SSDATA (file);
       if (Ffile_directory_p (file))
         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin),
                                              default_filename);