[Gnucash-changes] r13048 - gnucash/trunk - Make the cut/paste change compile on gtk 2.4 systems.

[David Hampton]

Author: hampton
Date: 2006-01-29 23:57:46 -0500 (Sun, 29 Jan 2006)
New Revision: 13048
Trac: http://svn.gnucash.org/trac/changeset/13048

Added:
   gnucash/trunk/src/gtk-compat.h
Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/Makefile.am
   gnucash/trunk/src/gnome-utils/gnc-main-window.c
Log:
 Make the cut/paste change compile on gtk 2.4 systems.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-30 03:53:09 UTC (rev 13047)
+++ gnucash/trunk/ChangeLog	2006-01-30 04:57:46 UTC (rev 13048)
@@ -1,5 +1,10 @@
 2006-01-29  David Hampton  <hampton at employees.org>
 
+	* src/gtk-compat.h:
+	* src/gnome-utils/gnc-main-window.c:
+	* src/Makefile.am: Make the cut/paste change compile on gtk 2.4
+	systems.
+
 	* various: Remove extraneous carriage returns from text that will
 	be put into a GtkLabel (since labels know how to wrap text).
 

Modified: gnucash/trunk/src/Makefile.am
===================================================================
--- gnucash/trunk/src/Makefile.am	2006-01-30 03:53:09 UTC (rev 13047)
+++ gnucash/trunk/src/Makefile.am	2006-01-30 04:57:46 UTC (rev 13048)
@@ -44,4 +44,5 @@
   gnc-test-env \
   valgrind-gnucash.supp \
   guile-mappings.h \
-  glib-compat.h
+  glib-compat.h \
+  gtk-compat.h

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2006-01-30 03:53:09 UTC (rev 13047)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2006-01-30 04:57:46 UTC (rev 13048)
@@ -40,6 +40,7 @@
 #ifndef HAVE_GLIB26
 #include "gkeyfile.h"
 #endif
+#include "gtk-compat.h"
 #ifdef HAVE_VALGRIND_CALLGRIND_H
 #include <valgrind/callgrind.h>
 #endif

Added: gnucash/trunk/src/gtk-compat.h
===================================================================
--- gnucash/trunk/src/gtk-compat.h	2006-01-30 03:53:09 UTC (rev 13047)
+++ gnucash/trunk/src/gtk-compat.h	2006-01-30 04:57:46 UTC (rev 13048)
@@ -0,0 +1,26 @@
+/*
+ * gtk-compat.h - GTK version compatability mappings
+ * Copyright (C) 2006, David Hampton <hampton at employees.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef HAVE_GTK26
+#define	gtk_action_set_sensitive(action, xxx) \
+       g_object_set(action, "sensitive", xxx, NULL)
+#define	gtk_action_set_visible(action, xxx) \
+       g_object_set(action, "visible", xxx, NULL)
+#endif