IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Explictly require gtk2.6 for conditionally compiled code that needs it.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13329 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Chris Shoemaker
2006-02-20 20:22:24 +00:00
parent 0b46642d65
commit 3c72393369
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gnome-utils/dialog-options.c
+6 -6
View File
@@ -23,7 +23,7 @@
#include "config.h" #include "config.h"
#ifdef HAVE_GLIB26 #ifdef HAVE_GTK26
#include <gtk/gtk.h> #include <gtk/gtk.h>
#else #else
#include <gnome.h> #include <gnome.h>
@@ -219,7 +219,7 @@ gnc_rd_option_rel_set_cb(GtkWidget *widget, gpointer *raw_option)
return; return;
} }
#ifdef HAVE_GLIB26 #ifdef HAVE_GTK26
static void static void
gnc_image_option_update_preview_cb (GtkFileChooser *chooser, gnc_image_option_update_preview_cb (GtkFileChooser *chooser,
GNCOption *option) GNCOption *option)
@@ -1881,7 +1881,7 @@ gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkBox *page_box,
GtkWidget *value; GtkWidget *value;
GtkWidget *label; GtkWidget *label;
GtkWidget *button; GtkWidget *button;
#ifndef HAVE_GLIB26 #ifndef HAVE_GTK26
GtkWidget *entry; GtkWidget *entry;
#endif #endif
gchar *colon_name; gchar *colon_name;
@@ -1897,7 +1897,7 @@ gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkBox *page_box,
button = gtk_button_new_with_label(_("Clear")); button = gtk_button_new_with_label(_("Clear"));
gtk_tooltips_set_tip(tooltips, button, _("Clear any selected image file."), NULL); 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"), value = gtk_file_chooser_button_new(_("Select image"),
GTK_FILE_CHOOSER_ACTION_OPEN); GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_tooltips_set_tip(tooltips, value, _("Select an image file."), NULL); gtk_tooltips_set_tip(tooltips, value, _("Select an image file."), NULL);
@@ -2343,7 +2343,7 @@ gnc_option_set_ui_value_pixmap (GNCOption *option, gboolean use_default,
if (string && *string) if (string && *string)
{ {
#ifdef HAVE_GLIB26 #ifdef HAVE_GTK26
gchar *test; gchar *test;
DEBUG("string = %s", string); DEBUG("string = %s", string);
gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(widget), string); gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(widget), string);
@@ -2713,7 +2713,7 @@ gnc_option_get_ui_value_font (GNCOption *option, GtkWidget *widget)
static SCM static SCM
gnc_option_get_ui_value_pixmap (GNCOption *option, GtkWidget *widget) gnc_option_get_ui_value_pixmap (GNCOption *option, GtkWidget *widget)
{ {
#ifdef HAVE_GLIB26 #ifdef HAVE_GTK26
gchar *string; gchar *string;
SCM result; SCM result;
src/gnome-utils/dialog-utils.c
+2 -2
View File
@@ -931,7 +931,7 @@ gnc_gtk_dialog_add_button (GtkWidget *dialog, const gchar *label, const gchar *s
GtkWidget *button; GtkWidget *button;
button = gtk_button_new_with_label(label); button = gtk_button_new_with_label(label);
#ifdef HAVE_GLIB26 #ifdef HAVE_GTK26
if (stock_id) { if (stock_id) {
GtkWidget *image; GtkWidget *image;
@@ -1010,7 +1010,7 @@ gnc_dialog_run (GtkDialog *dialog, const gchar *gconf_key)
return response; return response;
} }
#ifndef HAVE_GLIB26 #ifndef HAVE_GTK26
/** Find the first GtkLabel in a container. When called on a gtk2.4 /** 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 * message dialog, there is only one label in the dialog so theis
src/gnome-utils/dialog-utils.h
+1 -1
View File
@@ -156,7 +156,7 @@ void gnc_gtk_dialog_add_button (GtkWidget *dialog,
gint gint
gnc_dialog_run(GtkDialog *dialog, const gchar *gconf_key); gnc_dialog_run(GtkDialog *dialog, const gchar *gconf_key);
#ifndef HAVE_GLIB26 #ifndef HAVE_GTK26
void void
gtk_message_dialog_format_secondary_text(GtkMessageDialog *dialog, gtk_message_dialog_format_secondary_text(GtkMessageDialog *dialog,
const gchar *message_format, const gchar *message_format,
src/gnome-utils/gnc-main-window.c
+1 -1
View File
@@ -2973,7 +2973,7 @@ gnc_main_window_cmd_help_contents (GtkAction *action, GncMainWindow *window)
gnc_gnome_help (HF_HELP, NULL); 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 /** This is a helper function to find a data file and suck it into
* memory. * memory.
* *