r18906 - gnucash/trunk/src/app-utils - Improve non-gnome UI compatiblity: app-utils can compile without gtk as well.
Christian Stimming
cstim at code.gnucash.org
Sun Mar 14 17:01:53 EDT 2010
Author: cstim
Date: 2010-03-14 17:01:52 -0400 (Sun, 14 Mar 2010)
New Revision: 18906
Trac: http://svn.gnucash.org/trac/changeset/18906
Modified:
gnucash/trunk/src/app-utils/gnc-ui-common.h
gnucash/trunk/src/app-utils/option-util.c
Log:
Improve non-gnome UI compatiblity: app-utils can compile without gtk as well.
Modified: gnucash/trunk/src/app-utils/gnc-ui-common.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-common.h 2010-03-14 21:01:32 UTC (rev 18905)
+++ gnucash/trunk/src/app-utils/gnc-ui-common.h 2010-03-14 21:01:52 UTC (rev 18906)
@@ -27,17 +27,13 @@
#if defined(GNOME)
#include <gtk/gtk.h>
-#elif defined(MOTIF)
-#include <Xm/Xm.h>
#else
-**** No GUI selected ***
+/* **** No GUI selected *** */
#endif
#if defined(GNOME)
typedef GtkWidget *gncUIWidget;
-#elif defined(MOTIF)
-typedef Widget gncUIWidget;
-#elif defined(KDE)
+#else
typedef void *gncUIWidget;
#endif
Modified: gnucash/trunk/src/app-utils/option-util.c
===================================================================
--- gnucash/trunk/src/app-utils/option-util.c 2010-03-14 21:01:32 UTC (rev 18905)
+++ gnucash/trunk/src/app-utils/option-util.c 2010-03-14 21:01:52 UTC (rev 18906)
@@ -22,7 +22,9 @@
#include "config.h"
-#include <gtk/gtk.h>
+#ifdef GNOME
+# include <gtk/gtk.h>
+#endif
#include <glib/gi18n.h>
#include <time.h>
#include <string.h>
@@ -1709,7 +1711,6 @@
{
SCM oops;
char *section, *name;
- GtkWidget *dialog;
const gchar *message;
const gchar *format = _("There is a problem with option %s:%s.\n%s");
@@ -1725,7 +1726,9 @@
name = gnc_option_name(option);
section = gnc_option_section(option);
- dialog = gtk_message_dialog_new(NULL,
+#ifdef GNOME
+ {
+ GtkWidget *dialog = gtk_message_dialog_new(NULL,
0,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
@@ -1733,8 +1736,15 @@
section ? section : "(null)",
name ? name : "(null)",
message ? message : "(null)");
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ }
+#else
+ printf(format,
+ section ? section : "(null)",
+ name ? name : "(null)",
+ message ? message : "(null)");
+#endif
if (name != NULL)
free(name);
More information about the gnucash-changes
mailing list