Adapt cast macros to standard.

[~andy/gtk] / gtk / gtksocket.c

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 6fe8bd7b594401d0444471fb8f01bbf7ef14d3f8..d13cd995ec6ad12469e9a0072731b86ba7b08e15 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -32,7 +32,7 @@
 #include "gtksocket.h"
 #include "gtkdnd.h"
 
-#if GDK_WINDOWING == GDK_WINDOWING_X11
+#ifdef GDK_WINDOWING_X11
 
 /* Forward declararations */
 
@@ -307,8 +307,8 @@ gtk_socket_size_request (GtkWidget      *widget,
       gdk_error_trap_pop ();
     }
 
-  requisition->width = socket->request_width;
-  requisition->height = socket->request_height;
+  requisition->width = MAX (socket->request_width, 1);
+  requisition->height = MAX (socket->request_height, 1);
 }
 
 static void
@@ -748,7 +748,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
   return return_val;
 }
 
-#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
+#elif defined (GDK_WINDOWING_WIN32)
 
 guint
 gtk_socket_get_type ()