rep-gtk r384 - trunk

[chrisb svn gnome org]

Author: chrisb
Date: Sat Oct 18 18:07:11 2008
New Revision: 384
URL: http://svn.gnome.org/viewvc/rep-gtk?rev=384&view=rev

Log:
revert part of previous commit (radio_menu related)


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

Modified: trunk/gtk-compat.c
==============================================================================
--- trunk/gtk-compat.c	(original)
+++ trunk/gtk-compat.c	Sat Oct 18 18:07:11 2008
@@ -62,12 +62,30 @@
 		  func, func_data, button, activate_time);
 }
 
+#if 1 /* || (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)
+{
+	  GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+	    return gtk_radio_menu_item_new_with_label (g, label);
+}
+
+GtkWidget*
+gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+		                                                   const gchar      *label)
+{
+	  GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+	    return gtk_radio_menu_item_new_with_mnemonic (g, label);
+}
+
 GtkWidget*
 gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)
 {
-  GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
-  return gtk_radio_menu_item_new (g);
+	  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,

Modified: trunk/rep-gtk.h
==============================================================================
--- trunk/rep-gtk.h	(original)
+++ trunk/rep-gtk.h	Sat Oct 18 18:07:11 2008
@@ -285,7 +285,15 @@
 			    guint32 activate_time,
 			    repv position);
 
+#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);
+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_pixmap_new_interp (char *file, GtkWidget *intended_parent);