rep-gtk r381 - trunk

[chrisb svn gnome org]

Author: chrisb
Date: Sat Oct 18 13:15:17 2008
New Revision: 381
URL: http://svn.gnome.org/viewvc/rep-gtk?rev=381&view=rev

Log:
rep-gtk.h
gtk-compat.c: don't build functions useless for GTK >= 2.4 if we have it


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/gtk-compat.c
   trunk/rep-gtk.h

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Oct 18 13:15:17 2008
@@ -1,6 +1,7 @@
 0.18.2:
 	- fixups in configure.in
 	- updated BUGS, README and HACKING
+	- don't build functions useless for GTK >= 2.4 if we got it
 0.18.1:
 	- code-cleanup (allows building with CFLAGS="-Wall -ansi -pedantic")
 	- added a .pc file

Modified: trunk/gtk-compat.c
==============================================================================
--- trunk/gtk-compat.c	(original)
+++ trunk/gtk-compat.c	Sat Oct 18 13:15:17 2008
@@ -62,10 +62,7 @@
 		  func, func_data, button, activate_time);
 }
 
-/* mmc: sawfish (menu & sawfish-ui) code depends on a different semantics
-   of these calls, different from gtk+ versions, so we have to continue to
-   support that, and override the gtk versions. */
-#if 1 /* || (GTK_MAJOR_VERSION < 2 || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 4)) */
+#if (GTK_MAJOR_VERSION < 2 || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 4)) 
 GtkWidget*
 gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
 						const gchar      *label)
@@ -81,6 +78,7 @@
   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
   return gtk_radio_menu_item_new_with_mnemonic (g, label);
 }
+#endif
 
 GtkWidget*
 gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)
@@ -88,7 +86,6 @@
   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
   return gtk_radio_menu_item_new (g);
 }
-#endif /* < 2.4 */
 
 GtkWidget*
 gtk_pixmap_new_interp (gchar *file,
@@ -106,6 +103,7 @@
 }
 
 #ifndef HAVE_GDK_COLOR_COPY
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 4
 /*
  *--------------------------------------------------------------
  * gdk_color_copy
@@ -162,6 +160,7 @@
   g_mem_chunk_free (color_chunk, color);
 }
 #endif
+#endif
 
 GdkColor*
 gdk_color_parse_interp (char *spec)

Modified: trunk/rep-gtk.h
==============================================================================
--- trunk/rep-gtk.h	(original)
+++ trunk/rep-gtk.h	Sat Oct 18 13:15:17 2008
@@ -289,22 +289,25 @@
 			    guint32 activate_time,
 			    repv position);
 
-#if GTK_MAJOR_VERSION < 2 || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 4)
+#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 4)
 GtkWidget*
 gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
 						const gchar      *label);
 GtkWidget*
 gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
 						   const gchar      *label);
-GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
 #endif
 
+GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
+
 GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);
 
 #ifndef HAVE_GDK_COLOR_COPY
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 3
 GdkColor*    gdk_color_copy     (GdkColor *);
 void         gdk_color_free     (GdkColor *);
 #endif
+#endif
 
 GdkColor *gdk_color_parse_interp (char *spec);
 GdkColor *gtk_style_get_white_interp (GtkStyle *style);