[Gnucash-changes] r13329 - gnucash/trunk/src/gnome-utils -
Explictly require gtk2.6 for conditionally compiled code that
needs it.
Chris Shoemaker
chris at cvs.gnucash.org
Mon Feb 20 15:22:24 EST 2006
Author: chris
Date: 2006-02-20 15:22:24 -0500 (Mon, 20 Feb 2006)
New Revision: 13329
Trac: http://svn.gnucash.org/trac/changeset/13329
Modified:
gnucash/trunk/src/gnome-utils/dialog-options.c
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome-utils/dialog-utils.h
gnucash/trunk/src/gnome-utils/gnc-main-window.c
Log:
Explictly require gtk2.6 for conditionally compiled code that needs it.
Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c 2006-02-20 20:09:02 UTC (rev 13328)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c 2006-02-20 20:22:24 UTC (rev 13329)
@@ -23,7 +23,7 @@
#include "config.h"
-#ifdef HAVE_GLIB26
+#ifdef HAVE_GTK26
#include <gtk/gtk.h>
#else
#include <gnome.h>
@@ -219,7 +219,7 @@
return;
}
-#ifdef HAVE_GLIB26
+#ifdef HAVE_GTK26
static void
gnc_image_option_update_preview_cb (GtkFileChooser *chooser,
GNCOption *option)
@@ -1881,7 +1881,7 @@
GtkWidget *value;
GtkWidget *label;
GtkWidget *button;
-#ifndef HAVE_GLIB26
+#ifndef HAVE_GTK26
GtkWidget *entry;
#endif
gchar *colon_name;
@@ -1897,7 +1897,7 @@
button = gtk_button_new_with_label(_("Clear"));
gtk_tooltips_set_tip(tooltips, button, _("Clear any selected image file."), NULL);
-#ifdef HAVE_GLIB26
+#ifdef HAVE_GTK26
value = gtk_file_chooser_button_new(_("Select image"),
GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_tooltips_set_tip(tooltips, value, _("Select an image file."), NULL);
@@ -2343,7 +2343,7 @@
if (string && *string)
{
-#ifdef HAVE_GLIB26
+#ifdef HAVE_GTK26
gchar *test;
DEBUG("string = %s", string);
gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(widget), string);
@@ -2713,7 +2713,7 @@
static SCM
gnc_option_get_ui_value_pixmap (GNCOption *option, GtkWidget *widget)
{
-#ifdef HAVE_GLIB26
+#ifdef HAVE_GTK26
gchar *string;
SCM result;
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2006-02-20 20:09:02 UTC (rev 13328)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2006-02-20 20:22:24 UTC (rev 13329)
@@ -931,7 +931,7 @@
GtkWidget *button;
button = gtk_button_new_with_label(label);
-#ifdef HAVE_GLIB26
+#ifdef HAVE_GTK26
if (stock_id) {
GtkWidget *image;
@@ -1010,7 +1010,7 @@
return response;
}
-#ifndef HAVE_GLIB26
+#ifndef HAVE_GTK26
/** Find the first GtkLabel in a container. When called on a gtk2.4
* message dialog, there is only one label in the dialog so theis
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.h 2006-02-20 20:09:02 UTC (rev 13328)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.h 2006-02-20 20:22:24 UTC (rev 13329)
@@ -156,7 +156,7 @@
gint
gnc_dialog_run(GtkDialog *dialog, const gchar *gconf_key);
-#ifndef HAVE_GLIB26
+#ifndef HAVE_GTK26
void
gtk_message_dialog_format_secondary_text(GtkMessageDialog *dialog,
const gchar *message_format,
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2006-02-20 20:09:02 UTC (rev 13328)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2006-02-20 20:22:24 UTC (rev 13329)
@@ -2973,7 +2973,7 @@
gnc_gnome_help (HF_HELP, NULL);
}
-#ifdef HAVE_GLIB26
+#ifdef HAVE_GTK26
/** This is a helper function to find a data file and suck it into
* memory.
*
More information about the gnucash-changes
mailing list