r20194 - gnucash/trunk/src - Drop the obsolete gncUIWidget typedef because all of our GUI-code is inherently gtk-dependent (with the exception of option-util.h).
Christian Stimming
cstim at code.gnucash.org
Sat Jan 29 16:09:16 EST 2011
Author: cstim
Date: 2011-01-29 16:09:15 -0500 (Sat, 29 Jan 2011)
New Revision: 20194
Trac: http://svn.gnucash.org/trac/changeset/20194
Removed:
gnucash/trunk/src/app-utils/gnc-ui-common.h
Modified:
gnucash/trunk/src/RecnWindow.h
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/app-utils/option-util.c
gnucash/trunk/src/app-utils/option-util.h
gnucash/trunk/src/business/business-ledger/gncEntryLedger.c
gnucash/trunk/src/business/business-ledger/gncEntryLedger.h
gnucash/trunk/src/business/business-ledger/gncEntryLedgerP.h
gnucash/trunk/src/gnc-ui.h
gnucash/trunk/src/gnome-utils/gnc-gui-query.c
gnucash/trunk/src/gnome-utils/gnc-main-window.c
gnucash/trunk/src/gnome/dialog-sx-from-trans.c
gnucash/trunk/src/gnome/gnc-split-reg.c
gnucash/trunk/src/gnome/window-autoclear.h
gnucash/trunk/src/import-export/import-account-matcher.c
gnucash/trunk/src/import-export/import-account-matcher.h
gnucash/trunk/src/register/ledger-core/gnc-ledger-display.c
gnucash/trunk/src/register/ledger-core/gnc-ledger-display.h
gnucash/trunk/src/register/ledger-core/split-register-p.h
gnucash/trunk/src/register/ledger-core/split-register-util.c
gnucash/trunk/src/register/ledger-core/split-register.h
gnucash/trunk/src/register/register-core/basiccell.h
gnucash/trunk/src/register/register-core/table-allgui.h
gnucash/trunk/src/register/register-gnome/table-gnome.c
Log:
Drop the obsolete gncUIWidget typedef because all of our GUI-code is inherently gtk-dependent (with the exception of option-util.h).
If there were any re-write of gnucash with a different GUI toolkit, it will
define all GUI-related functions in its own way, so there's no point in
pretending those very gtk'ish functions were usable in a different toolkit as well.
Modified: gnucash/trunk/src/RecnWindow.h
===================================================================
--- gnucash/trunk/src/RecnWindow.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/RecnWindow.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -27,8 +27,8 @@
#ifndef RECONCILE_H
#define RECONCILE_H
-#include "gnc-ui-common.h"
#include "Account.h"
+#include <gtk/gtk.h> /* For GtkWidget */
/** STRUCTS *********************************************************/
@@ -47,7 +47,7 @@
* Return: recnData - the instance of this RecnWindow, or NULL if the
* user pressed Cancel in the initial date query.
\********************************************************************/
-RecnWindow *recnWindow (gncUIWidget parent, Account *account);
+RecnWindow *recnWindow (GtkWidget *parent, Account *account);
/********************************************************************\
* recnWindowWithBalance
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/app-utils/Makefile.am 2011-01-29 21:09:15 UTC (rev 20194)
@@ -84,7 +84,6 @@
gnc-help-utils.h \
gnc-helpers.h \
gnc-sx-instance-model.h \
- gnc-ui-common.h \
gnc-ui-util.h \
guile-util.h \
option-util.h
Deleted: gnucash/trunk/src/app-utils/gnc-ui-common.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-common.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/app-utils/gnc-ui-common.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -1,40 +0,0 @@
-/********************************************************************\
- * gnc-ui-common.h -- define GUI related but independent items *
- * *
- * Copyright (C) 1999, 2000 Rob Browning *
- * *
- * 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, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-#ifndef GNC_UI_COMMON_H
-#define GNC_UI_COMMON_H
-
-#if defined(GNOME)
-#include <gtk/gtk.h>
-#else
-/* **** No GUI selected *** */
-#endif
-
-#if defined(GNOME)
-typedef GtkWidget *gncUIWidget;
-#else
-typedef void *gncUIWidget;
-#endif
-
-#endif
Modified: gnucash/trunk/src/app-utils/option-util.c
===================================================================
--- gnucash/trunk/src/app-utils/option-util.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/app-utils/option-util.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -56,7 +56,7 @@
gboolean changed;
/* The widget which is holding this option */
- gncUIWidget widget;
+ GncOptionWidgetPtr widget;
/* The option db which holds this option */
GNCOptionDB *odb;
@@ -140,7 +140,7 @@
option->changed = changed;
}
-gncUIWidget
+GncOptionWidgetPtr
gnc_option_get_widget (GNCOption *option)
{
if (!option) return NULL;
@@ -148,7 +148,7 @@
}
void
-gnc_option_set_widget (GNCOption *option, gncUIWidget widget)
+gnc_option_set_widget (GNCOption *option, GncOptionWidgetPtr widget)
{
g_return_if_fail (option != NULL);
option->widget = widget;
Modified: gnucash/trunk/src/app-utils/option-util.h
===================================================================
--- gnucash/trunk/src/app-utils/option-util.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/app-utils/option-util.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -31,9 +31,33 @@
#include "gnc-commodity.h"
#include "qof.h"
#include "GNCId.h"
-#include "gnc-ui-common.h"
+#if defined(GNOME)
+# include <gtk/gtk.h>
+#endif
+/** This is the opaque pointer to this option's widget.
+ *
+ * Note: This option code is still almost GUI-independent because it
+ * does not deal with the UI implementation of the option's widgets,
+ * but it stores a pointer to a widget (and incidentally some of the
+ * implementation might show an error message through the gtk-specific
+ * message box). Hence, the option code just stores a pointer
+ * transparently, which is where the GncOptionWidgetPtr typedef comes
+ * from. We keep this typedef just in this file to underline that the
+ * code of option-utils.[hc] might still be re-usable in a
+ * UI-independent usage, even though the only implementation is a gtk
+ * one. */
+typedef
+#if defined(GNOME)
+GtkWidget *
+#else
+/* **** No GUI selected *** */
+void *
+#endif
+GncOptionWidgetPtr;
+
+
typedef struct gnc_option GNCOption;
typedef struct gnc_option_section GNCOptionSection;
typedef struct gnc_option_db GNCOptionDB;
@@ -52,8 +76,8 @@
gboolean gnc_option_get_changed (GNCOption *option);
void gnc_option_set_changed (GNCOption *option, gboolean changed);
-gncUIWidget gnc_option_get_widget (GNCOption *option);
-void gnc_option_set_widget (GNCOption *option, gncUIWidget widget);
+GncOptionWidgetPtr gnc_option_get_widget (GNCOption *option);
+void gnc_option_set_widget (GNCOption *option, GncOptionWidgetPtr widget);
SCM gnc_option_get_ui_value(GNCOption *option);
void gnc_option_set_ui_value(GNCOption *option, gboolean use_default);
Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedger.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedger.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedger.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -540,7 +540,7 @@
gnc_entry_ledger_display_refresh (ledger);
}
-void gnc_entry_ledger_set_parent (GncEntryLedger *ledger, gncUIWidget parent)
+void gnc_entry_ledger_set_parent (GncEntryLedger *ledger, GtkWidget *parent)
{
if (!ledger) return;
ledger->parent = parent;
Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedger.h
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedger.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedger.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -103,7 +103,7 @@
/* Get the Table */
Table * gnc_entry_ledger_get_table (GncEntryLedger *ledger);
-void gnc_entry_ledger_set_parent (GncEntryLedger *ledger, gncUIWidget parent);
+void gnc_entry_ledger_set_parent (GncEntryLedger *ledger, GtkWidget *parent);
void gnc_entry_ledger_set_readonly (GncEntryLedger *ledger, gboolean readonly);
Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerP.h
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerP.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerP.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -42,7 +42,7 @@
GncEntry * hint_entry; /* A Hint for where to display */
- gncUIWidget parent;
+ GtkWidget * parent;
QofBook * book;
Table * table;
GncOrder * order;
Modified: gnucash/trunk/src/gnc-ui.h
===================================================================
--- gnucash/trunk/src/gnc-ui.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/gnc-ui.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -33,10 +33,10 @@
#include <glib.h>
-#include "gnc-ui-common.h"
#include "Account.h"
#include "gnc-pricedb.h"
#include "guile-mappings.h"
+#include <gtk/gtk.h> /* For GtkWidget */
/** Help Files ******************************************************/
@@ -72,17 +72,17 @@
/* Dialog windows ***************************************************/
extern gboolean
-gnc_verify_dialog(gncUIWidget parent,
+gnc_verify_dialog(GtkWidget *parent,
gboolean yes_is_default,
const char *format, ...) G_GNUC_PRINTF (3, 4);
extern gint
-gnc_ok_cancel_dialog(gncUIWidget parent,
+gnc_ok_cancel_dialog(GtkWidget *parent,
gint default_result,
const char *format, ...) G_GNUC_PRINTF (3, 4);
extern void
-gnc_warning_dialog(gncUIWidget parent,
+gnc_warning_dialog(GtkWidget *parent,
const char *format, ...) G_GNUC_PRINTF (2, 3);
extern void
@@ -97,17 +97,17 @@
extern void
gnc_gnome_help (const char *file_name, const char *target_link);
-int gnc_choose_radio_option_dialog (gncUIWidget parent,
+int gnc_choose_radio_option_dialog (GtkWidget *parent,
const char *title,
const char *msg,
const char *button_name,
int default_value,
GList *radio_list);
-gboolean gnc_dup_trans_dialog (gncUIWidget parent, time_t *date_p,
+gboolean gnc_dup_trans_dialog (GtkWidget *parent, time_t *date_p,
const char *num, char **out_num);
-void gnc_tax_info_dialog (gncUIWidget parent);
-void gnc_stock_split_dialog (gncUIWidget parent, Account * initial);
+void gnc_tax_info_dialog (GtkWidget *parent);
+void gnc_stock_split_dialog (GtkWidget *parent, Account * initial);
typedef enum
{
@@ -115,11 +115,11 @@
GNC_PRICE_NEW,
} GNCPriceEditType;
-void gnc_price_edit_dialog (gncUIWidget parent, QofSession *session,
+void gnc_price_edit_dialog (GtkWidget *parent, QofSession *session,
GNCPrice *price, GNCPriceEditType type);
GNCPrice* gnc_price_edit_by_guid (GtkWidget * parent, const GncGUID * guid);
-void gnc_prices_dialog (gncUIWidget parent);
-void gnc_commodities_dialog (gncUIWidget parent);
+void gnc_prices_dialog (GtkWidget *parent);
+void gnc_commodities_dialog (GtkWidget *parent);
/* Open a dialog asking for username and password. The heading and
* either 'initial_*' arguments may be NULL. If the dialog returns
@@ -127,7 +127,7 @@
* output variables. They should be g_freed when no longer needed. If
* the dialog returns FALSE, the user pressed CANCEL and NULL was
* stored in username and password. */
-gboolean gnc_get_username_password (gncUIWidget parent,
+gboolean gnc_get_username_password (GtkWidget *parent,
const char *heading,
const char *initial_username,
const char *initial_password,
@@ -136,12 +136,12 @@
/* Managing the GUI Windows *****************************************/
-gncUIWidget gnc_ui_get_toplevel (void);
+GtkWidget *gnc_ui_get_toplevel (void);
/* Changing the GUI Cursor ******************************************/
-void gnc_set_busy_cursor(gncUIWidget w, gboolean update_now);
-void gnc_unset_busy_cursor(gncUIWidget w);
+void gnc_set_busy_cursor(GtkWidget *w, gboolean update_now);
+void gnc_unset_busy_cursor(GtkWidget *w);
/* QIF Import Windows ***********************************************/
Modified: gnucash/trunk/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-from-trans.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/gnome/dialog-sx-from-trans.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -271,7 +271,7 @@
}
if ( ! gnc_numeric_zero_p( runningBalance )
- && !gnc_verify_dialog( (gncUIWidget)sxfti->dialog,
+ && !gnc_verify_dialog( (GtkWidget *)sxfti->dialog,
FALSE, "%s",
_("The Scheduled Transaction Editor "
"cannot automatically balance "
Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -67,7 +67,7 @@
static void gnc_split_reg_determine_read_only( GNCSplitReg *gsr );
static GNCPlaceholderType gnc_split_reg_get_placeholder( GNCSplitReg *gsr );
-static gncUIWidget gnc_split_reg_get_parent( GNCLedgerDisplay *ledger );
+static GtkWidget *gnc_split_reg_get_parent( GNCLedgerDisplay *ledger );
static void gsr_create_table( GNCSplitReg *gsr );
static void gsr_setup_table( GNCSplitReg *gsr );
@@ -2013,7 +2013,7 @@
}
static
-gncUIWidget
+GtkWidget *
gnc_split_reg_get_parent( GNCLedgerDisplay *ledger )
{
GNCSplitReg *gsr =
Modified: gnucash/trunk/src/gnome/window-autoclear.h
===================================================================
--- gnucash/trunk/src/gnome/window-autoclear.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/gnome/window-autoclear.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -25,7 +25,7 @@
typedef struct _AutoClearWindow AutoClearWindow;
-AutoClearWindow *autoClearWindow (gncUIWidget parent, Account *account);
+AutoClearWindow *autoClearWindow (GtkWidget *parent, Account *account);
void gnc_ui_autoclear_window_raise(AutoClearWindow * autoClearData);
#endif
Modified: gnucash/trunk/src/gnome-utils/gnc-gui-query.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -52,7 +52,7 @@
* Return: the result the user selected *
\********************************************************************/
gint
-gnc_ok_cancel_dialog(gncUIWidget parent,
+gnc_ok_cancel_dialog(GtkWidget *parent,
gint default_result,
const gchar *format, ...)
{
@@ -98,7 +98,7 @@
* string. *
\********************************************************************/
gboolean
-gnc_verify_dialog(gncUIWidget parent, gboolean yes_is_default,
+gnc_verify_dialog(GtkWidget *parent, gboolean yes_is_default,
const gchar *format, ...)
{
GtkWidget *dialog;
@@ -269,7 +269,7 @@
*/
int
-gnc_choose_radio_option_dialog(gncUIWidget parent,
+gnc_choose_radio_option_dialog(GtkWidget *parent,
const char *title,
const char *msg,
const char *button_name,
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -2315,7 +2315,7 @@
gnc_main_window_new (void)
{
GncMainWindow *window;
- gncUIWidget old_window;
+ GtkWidget *old_window;
window = g_object_new (GNC_TYPE_MAIN_WINDOW, NULL);
gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
@@ -4036,7 +4036,7 @@
* if there is none.
*
* @return A pointer to a GtkWindow object. */
-gncUIWidget
+GtkWidget *
gnc_ui_get_toplevel (void)
{
GList *window;
Modified: gnucash/trunk/src/import-export/import-account-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-account-matcher.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/import-export/import-account-matcher.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -142,7 +142,7 @@
}
}
-Account * gnc_import_select_account(gncUIWidget parent,
+Account * gnc_import_select_account(GtkWidget *parent,
const gchar * account_online_id_value,
gboolean auto_create,
const gchar * account_human_description,
Modified: gnucash/trunk/src/import-export/import-account-matcher.h
===================================================================
--- gnucash/trunk/src/import-export/import-account-matcher.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/import-export/import-account-matcher.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -26,7 +26,7 @@
#define ACCOUNT_MATCHER_H
#include "Account.h"
-#include "gnc-ui-common.h"
+#include <gtk/gtk.h> /* For GtkWidget */
/** Must be called with a string containing a unique identifier for the
account. If an account with a matching online_id kvp_frame is
@@ -89,7 +89,7 @@
@return A pointer to the found or created Account, or NULL if no
account was found or created.
*/
-Account * gnc_import_select_account(gncUIWidget parent,
+Account * gnc_import_select_account(GtkWidget *parent,
const gchar * account_online_id_value,
gboolean auto_create,
const gchar * account_human_description,
Modified: gnucash/trunk/src/register/ledger-core/gnc-ledger-display.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/gnc-ledger-display.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/register/ledger-core/gnc-ledger-display.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -500,7 +500,7 @@
return ld;
}
-gncUIWidget
+GtkWidget *
gnc_ledger_display_get_parent( GNCLedgerDisplay *ld )
{
if ( ld == NULL )
@@ -512,7 +512,7 @@
return ld->get_parent( ld );
}
-static gncUIWidget
+static GtkWidget *
gnc_ledger_display_parent (void *user_data)
{
GNCLedgerDisplay *ld = user_data;
Modified: gnucash/trunk/src/register/ledger-core/gnc-ledger-display.h
===================================================================
--- gnucash/trunk/src/register/ledger-core/gnc-ledger-display.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/register/ledger-core/gnc-ledger-display.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -42,7 +42,7 @@
typedef struct gnc_ledger_display GNCLedgerDisplay;
typedef void (*GNCLedgerDisplayDestroy) (GNCLedgerDisplay *ld);
-typedef gncUIWidget (*GNCLedgerDisplayGetParent) (GNCLedgerDisplay *ld);
+typedef GtkWidget *(*GNCLedgerDisplayGetParent) (GNCLedgerDisplay *ld);
typedef void (*GNCLedgerDisplaySetHelp) (GNCLedgerDisplay *ld,
const char *help_str);
@@ -72,7 +72,7 @@
GNCLedgerDisplayGetParent get_parent);
/** Returns the parent of a given ledger display */
-gncUIWidget gnc_ledger_display_get_parent( GNCLedgerDisplay *ld );
+GtkWidget *gnc_ledger_display_get_parent( GNCLedgerDisplay *ld );
/* return the split register associated with a ledger display */
SplitRegister * gnc_ledger_display_get_split_register (GNCLedgerDisplay *ld);
Modified: gnucash/trunk/src/register/ledger-core/split-register-p.h
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-p.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/register/ledger-core/split-register-p.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -122,7 +122,7 @@
SRInfo * gnc_split_register_get_info (SplitRegister *reg);
-gncUIWidget gnc_split_register_get_parent (SplitRegister *reg);
+GtkWidget *gnc_split_register_get_parent (SplitRegister *reg);
Split * gnc_split_register_get_split (SplitRegister *reg,
VirtualCellLocation vcell_loc);
Modified: gnucash/trunk/src/register/ledger-core/split-register-util.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-util.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/register/ledger-core/split-register-util.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -72,7 +72,7 @@
return reg->sr_info;
}
-gncUIWidget
+GtkWidget *
gnc_split_register_get_parent (SplitRegister *reg)
{
SRInfo *info = gnc_split_register_get_info (reg);
Modified: gnucash/trunk/src/register/ledger-core/split-register.h
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/register/ledger-core/split-register.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -268,7 +268,7 @@
};
/** Callback function type */
-typedef gncUIWidget (*SRGetParentCallback) (gpointer user_data);
+typedef GtkWidget *(*SRGetParentCallback) (gpointer user_data);
/* Prototypes ******************************************************/
Modified: gnucash/trunk/src/register/register-core/basiccell.h
===================================================================
--- gnucash/trunk/src/register/register-core/basiccell.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/register/register-core/basiccell.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -141,10 +141,9 @@
#include <gdk/gdk.h>
#include <glib.h>
+#include <gtk/gtk.h> /* For GtkWidget */
-#include "gnc-ui-common.h"
-
typedef struct basic_cell BasicCell;
typedef BasicCell * (*CellCreateFunc) (void);
Modified: gnucash/trunk/src/register/register-core/table-allgui.h
===================================================================
--- gnucash/trunk/src/register/register-core/table-allgui.h 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/register/register-core/table-allgui.h 2011-01-29 21:09:15 UTC (rev 20194)
@@ -303,7 +303,7 @@
/** UI-specific functions *******************************/
/* Initialize the GUI from a table */
-void gnc_table_init_gui (gncUIWidget widget, gpointer data);
+void gnc_table_init_gui (GtkWidget *widget, gpointer data);
void gnc_table_realize_gui (Table *table);
Modified: gnucash/trunk/src/register/register-gnome/table-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/table-gnome.c 2011-01-29 20:58:56 UTC (rev 20193)
+++ gnucash/trunk/src/register/register-gnome/table-gnome.c 2011-01-29 21:09:15 UTC (rev 20194)
@@ -148,7 +148,7 @@
Weird. Also, since this function only works with a GnucashRegister
widget, maybe some of it should be moved to gnucash-sheet.c. */
void
-gnc_table_init_gui (gncUIWidget widget, void *data)
+gnc_table_init_gui (GtkWidget *widget, void *data)
{
GNCHeaderWidths widths;
GnucashSheet *sheet;
More information about the gnucash-changes
mailing list