rep-gtk r382 - trunk

[chrisb svn gnome org]

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

Log:
removed functions no longer available in GTK 2.4+ 


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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Oct 18 13:28:02 2008
@@ -1,10 +1,13 @@
 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
+	- removed functions no longer available in GTK 2.4+
+	- spec-file does now install all examples into the doc-dir
+
 0.18.1:
-	- code-cleanup (allows building with CFLAGS="-Wall -ansi -pedantic")
+	- started code-cleanup
 	- added a .pc file
 	- added ATK-Accessibility Support
 	- added Status-Icon Widget
-	- for more see ChangeLog
+	- bumped gtk req to 2.6, glib req to 2.6 and glade req to 2.4
+	- dropped an function no longer available in GTK 2.5+

Modified: trunk/gtk-compat.c
==============================================================================
--- trunk/gtk-compat.c	(original)
+++ trunk/gtk-compat.c	Sat Oct 18 13:28:02 2008
@@ -62,24 +62,6 @@
 		  func, func_data, button, activate_time);
 }
 
-#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)
-{
-  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);
-}
-#endif
-
 GtkWidget*
 gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)
 {
@@ -102,66 +84,6 @@
   return gtk_pixmap_new (pixmap, mask);
 }
 
-#ifndef HAVE_GDK_COLOR_COPY
-#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 4
-/*
- *--------------------------------------------------------------
- * gdk_color_copy
- *
- *   Copy a color structure into new storage.
- *
- * Arguments:
- *   "color" is the color struct to copy.
- *
- * Results:
- *   A new color structure.  Free it with gdk_color_free.
- *
- *--------------------------------------------------------------
- */
-
-static GMemChunk *color_chunk;
-
-GdkColor*
-gdk_color_copy (GdkColor *color)
-{
-  GdkColor *new_color;
-  
-  g_return_val_if_fail (color != NULL, NULL);
-
-  if (color_chunk == NULL)
-    color_chunk = g_mem_chunk_new ("colors",
-				   sizeof (GdkColor),
-				   4096,
-				   G_ALLOC_AND_FREE);
-
-  new_color = g_chunk_new (GdkColor, color_chunk);
-  *new_color = *color;
-  return new_color;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_color_free
- *
- *   Free a color structure obtained from gdk_color_copy.  Do not use
- *   with other color structures.
- *
- * Arguments:
- *   "color" is the color struct to free.
- *
- *-------------------------------------------------------------- */
-
-void
-gdk_color_free (GdkColor *color)
-{
-  g_assert (color_chunk != NULL);
-  g_return_if_fail (color != NULL);
-
-  g_mem_chunk_free (color_chunk, color);
-}
-#endif
-#endif
-
 GdkColor*
 gdk_color_parse_interp (char *spec)
 {

Modified: trunk/rep-gtk.c
==============================================================================
--- trunk/rep-gtk.c	(original)
+++ trunk/rep-gtk.c	Sat Oct 18 13:28:02 2008
@@ -2024,9 +2024,6 @@
   info.class_size = parent_info.class_size;
   info.class_init_func = NULL;
   info.object_init_func = NULL;
-#if GTK_MAJOR_VERSION > 1 || GTK_MINOR_VERSION > 0
-  info.base_class_init_func = NULL;
-#endif
 
   return gtk_type_unique (parent_type, &info);
 }

Modified: trunk/rep-gtk.h
==============================================================================
--- trunk/rep-gtk.h	(original)
+++ trunk/rep-gtk.h	Sat Oct 18 13:28:02 2008
@@ -277,10 +277,6 @@
 
 /* Gtk stuff that wouldn't be here in an ideal world. */
 
-#if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 0
-typedef int GtkWidgetFlags;
-#endif
-
 gchar *gtk_label_get_interp (GtkLabel *label);
 void gtk_menu_popup_interp (GtkMenu *menu,
 			    GtkWidget *parent_menu_shell,
@@ -289,26 +285,10 @@
 			    guint32 activate_time,
 			    repv position);
 
-#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);
-#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);