From dc87b03019fb068d610b2b2b567b3b7e27f182dc Mon Sep 17 00:00:00 2001 From: David Hampton Date: Wed, 1 Oct 2003 02:29:35 +0000 Subject: [PATCH] Remove some no-longer-used code. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gnucash-gnome2-dev@9445 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome/gnc-split-reg.c | 60 +++++++------------------------------ src/gnome/gnc-split-reg.h | 12 ++++++++ src/gnome/window-register.c | 42 +------------------------- src/gnome/window-register.h | 3 -- 4 files changed, 24 insertions(+), 93 deletions(-) diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c index e5adbb87f3..54b178adf2 100644 --- a/src/gnome/gnc-split-reg.c +++ b/src/gnome/gnc-split-reg.c @@ -90,11 +90,11 @@ void gnc_split_reg_raise( GNCSplitReg *gsr ); static GtkWidget* add_summary_label( GtkWidget *summarybar, const char *label_str ); +#if 0 static void gnc_toolbar_change_cb( void *data ); +#endif static void gnc_split_reg_determine_read_only( GNCSplitReg *gsr ); -static void gnc_split_reg_change_style (GNCSplitReg *gsr, SplitRegisterStyle style); - static GNCPlaceholderType gnc_split_reg_get_placeholder( GNCSplitReg *gsr ); static gncUIWidget gnc_split_reg_get_parent( GNCLedgerDisplay *ledger ); @@ -475,6 +475,7 @@ static void gsr_create_toolbar( GNCSplitReg *gsr ) { +#if 0 GladeXML *xml; GtkWidget *widget; SCM id; @@ -513,6 +514,7 @@ gsr_create_toolbar( GNCSplitReg *gsr ) widget = glade_xml_get_widget (xml, "toolbar_duplicate"); gtk_widget_set_sensitive(widget, FALSE); } +#endif } static @@ -846,6 +848,7 @@ gsr_redraw_all_cb (GnucashRegister *g_reg, gpointer data) expand = gnc_split_register_current_trans_expanded (reg); sensitive = (reg->style == REG_STYLE_LEDGER); +#if 0 if ( gsr->createFlags & CREATE_TOOLBAR ) { gtk_signal_handler_block_by_data (GTK_OBJECT(gsr->split_button), gsr); @@ -855,6 +858,7 @@ gsr_redraw_all_cb (GnucashRegister *g_reg, gpointer data) (GTK_OBJECT (gsr->split_button), gsr); gtk_widget_set_sensitive( gsr->split_button, sensitive ); } +#endif if ( gsr->createFlags & CREATE_MENUS ) { gtk_signal_handler_block_by_data @@ -1570,49 +1574,7 @@ gnc_split_reg_new_trans_cb (GtkWidget *widget, gpointer data) void gsr_default_jump_handler( GNCSplitReg *gsr, gpointer data ) { - SplitRegister *reg; - Account *account; - Account *leader; - Split *split; - - reg = gnc_ledger_display_get_split_register (gsr->ledger); - - split = gnc_split_register_get_current_split (reg); - if (split == NULL) - return; - - account = xaccSplitGetAccount(split); - if (account == NULL) - return; - - leader = gnc_ledger_display_leader( gsr->ledger ); - - if (account == leader) - { - split = xaccSplitGetOtherSplit(split); - if (split == NULL) - return; - - account = xaccSplitGetAccount(split); - if (account == NULL) - return; - if (account == leader) - return; - } - - { - GNCLedgerDisplay *ld; - GNCSplitReg *gsr; - - ld = gnc_ledger_display_simple( account ); - gsr = gnc_ledger_display_get_user_data( ld ); - if ( !gsr ) { - /* create new */ - gsr = regWindowSimple( account ); - } - gnc_split_reg_raise( gsr ); - gnc_split_reg_jump_to_split( gsr, split ); - } + g_assert_not_reached(); } void @@ -1622,7 +1584,6 @@ gnc_split_reg_jump_cb( GtkWidget *widget, gpointer data ) gsr_emit_simple_signal( gsr, "jump" ); } -static void gnc_split_reg_change_style (GNCSplitReg *gsr, SplitRegisterStyle style) { @@ -1878,7 +1839,7 @@ gnc_split_reg_goto_next_trans_row (GNCSplitReg *gsr) gsr ); } -static void +void gnc_split_reg_enter( GNCSplitReg *gsr, gboolean next_transaction ) { SplitRegister *sr = gnc_ledger_display_get_split_register( gsr->ledger ); @@ -2281,6 +2242,7 @@ gnc_split_reg_determine_read_only( GNCSplitReg *gsr ) } +#if 0 static void gnc_toolbar_change_cb (void *data) @@ -2288,6 +2250,7 @@ gnc_toolbar_change_cb (void *data) GNCSplitReg *gsr = data; gnc_split_reg_refresh_toolbar( gsr ); } +#endif static gncUIWidget @@ -2342,8 +2305,7 @@ gnc_split_reg_get_sort_type( GNCSplitReg *gsr ) void gnc_split_reg_set_sort_type( GNCSplitReg *gsr, SortType t ) { - /* FIXME */ - PERR( "unimplemented" ); + gnc_split_reg_sort( gsr, t ); } GtkWidget* diff --git a/src/gnome/gnc-split-reg.h b/src/gnome/gnc-split-reg.h index 81512d4268..253fa2f958 100644 --- a/src/gnome/gnc-split-reg.h +++ b/src/gnome/gnc-split-reg.h @@ -243,6 +243,11 @@ GnucashRegister *gnc_split_reg_get_register( GNCSplitReg *gsr ); SortType gnc_split_reg_get_sort_type( GNCSplitReg *gsr ); void gnc_split_reg_set_sort_type( GNCSplitReg *gsr, SortType t ); +/** + * Gets/sets the style of the GNCSplitReg. + **/ +void gnc_split_reg_change_style (GNCSplitReg *gsr, SplitRegisterStyle style); + /** * Retreives the various menus created by the GNCSplitReg. Callers may want * to put these in a more traditional menu bar, for instance. @@ -303,4 +308,11 @@ void gnc_split_reg_jump_to_blank (GNCSplitReg *gsr); void gnc_split_reg_jump_to_split(GNCSplitReg *gsr, Split *split); void gnc_split_reg_jump_to_split_amount(GNCSplitReg *gsr, Split *split); +void gsr_default_delete_handler( GNCSplitReg *gsr, gpointer data ); +void gnc_split_reg_enter( GNCSplitReg *gsr, gboolean next_transaction ); +void gsr_default_delete_handler( GNCSplitReg *gsr, gpointer data ); +void gsr_default_reinit_handler( GNCSplitReg *gsr, gpointer data ); +void gsr_default_expand_handler( GNCSplitReg *gsr, gpointer data ); +void gsr_default_schedule_handler( GNCSplitReg *gsr, gpointer data ); + #endif /* GNC_SPLIT_REG_H */ diff --git a/src/gnome/window-register.c b/src/gnome/window-register.c index cfeb4c2d4e..f2d1bcfb4e 100644 --- a/src/gnome/window-register.c +++ b/src/gnome/window-register.c @@ -62,7 +62,6 @@ #include "window-register.h" #include "window-report.h" #include "top-level.h" -#include "dialog-print-check.h" #include "guile-mappings.h" typedef struct _RegDateWindow RegDateWindow; @@ -95,8 +94,6 @@ struct _RegWindow GNCSplitReg *gsr; RegDateWindow *date_window; - /* pcd = "print check dialog" */ - gpointer pcd; gboolean read_only; GtkWidget *reconciled_menu_item; @@ -119,18 +116,6 @@ GNCLedgerDisplay *gnc_RegWindow_ledger (RegWindow *data) return data->ledger; } -gpointer -gnc_RegWindow_get_pcd (RegWindow *data) -{ - return data->pcd; -} - -void -gnc_RegWindow_set_pcd (RegWindow *data, gpointer pcd) -{ - data->pcd = pcd; -} - /* This static indicates the debugging module that this .o belongs to. */ /* static short module = MOD_GUI; */ @@ -643,29 +628,7 @@ gnc_ui_find_transactions_cb (GtkWidget *widget, gpointer data) void gnc_register_print_check_cb(GtkWidget * widget, gpointer data) { - RegWindow * reg_data = data; - SplitRegister * reg = - gnc_ledger_display_get_split_register (reg_data->ledger); - Split * split = gnc_split_register_get_current_split(reg); - Transaction * trans = xaccSplitGetParent(split); - - const char * payee; - const char * memo; - gnc_numeric amount; - time_t date; - - if(split && trans) - { - payee = xaccTransGetDescription(trans); - memo = xaccTransGetNotes(trans); - if (memo == NULL) - memo = ""; - amount = xaccSplitGetAmount(split); - amount = gnc_numeric_abs (amount); - date = xaccTransGetDate(trans); - - gnc_ui_print_check_dialog_create(reg_data, payee, amount, date, memo); - } + g_assert_not_reached(); } void @@ -748,9 +711,6 @@ gnc_register_destroy_cb(GtkWidget *widget, gpointer data) regData->date_window = NULL; } - if (regData->pcd) - gnc_ui_print_check_dialog_destroy(regData->pcd); - gtk_widget_destroy( regData->window ); g_free(regData); diff --git a/src/gnome/window-register.h b/src/gnome/window-register.h index 427c30ed67..cc982037aa 100644 --- a/src/gnome/window-register.h +++ b/src/gnome/window-register.h @@ -39,9 +39,6 @@ GNCSplitReg* regWindowAccGroup(Account *account_group); RegWindow* regWindowLedger(GNCLedgerDisplay *ledger); -gpointer gnc_RegWindow_get_pcd (RegWindow *data); -void gnc_RegWindow_set_pcd (RegWindow *data, gpointer); - void gnc_register_raise(RegWindow *regData); #endif