IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor some mdi code into gnome-utils module.

Browse Source 
Remove __ prefix from header guards.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5424 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-09-24 22:58:43 +00:00
parent 1817217f74
commit e222f9e9c3
29 changed files with 175 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/file/io-gncxml-v2.h
View File

@ -28,8 +28,8 @@
* Initial code by James LewisMoss
*/
#ifndef __IO_GNCXML_V2_H__
#define __IO_GNCXML_V2_H__
#ifndef IO_GNCXML_V2_H
#define IO_GNCXML_V2_H
#include <glib.h>

4
src/backend/rpc/RpcBackend.h
View File

@ -10,8 +10,8 @@
* Copyright (c) 2001, Derek Atkins
*/
#ifndef __RPC_BACKEND_H
#define __RPC_BACKEND_H
#ifndef RPC_BACKEND_H
#define RPC_BACKEND_H
#include "BackendP.h"

4
src/backend/rpc/RpcServer.h
View File

@ -10,8 +10,8 @@
* Copyright (c) 2001, Derek Atkins
*/
#ifndef __RPC_SERVER_H
#define __RPC_SERVER_H
#ifndef RPC_SERVER_H
#define RPC_SERVER_H
typedef struct _gncrpc_svc GncRpcSvc;

4
src/backend/rpc/RpcServerP.h
View File

@ -10,8 +10,8 @@
* Copyright (c) 2001, Derek Atkins
*/
#ifndef __RPC_SERVERP_H
#define __RPC_SERVERP_H
#ifndef RPC_SERVERP_H
#define RPC_SERVERP_H
#include "xprt_thrd.h"

4
src/backend/rpc/RpcSock.h
View File

@ -10,8 +10,8 @@
* Copyright (c) 2001, Derek Atkins
*/
#ifndef __RPC_SOCK_H
#define __RPC_SOCK_H
#ifndef RPC_SOCK_H
#define RPC_SOCK_H
#include "xprt_thrd.h"
#include "RpcBackend.h"

4
src/backend/rpc/RpcUtils.h
View File

@ -10,8 +10,8 @@
* Copyright (c) 2001, Derek Atkins
*/
#ifndef __RPC_UTILS_H
#define __RPC_UTILS_H
#ifndef RPC_UTILS_H
#define RPC_UTILS_H
#include "gncRpc.h"
#include "Account.h"

1
src/gnome-utils/Makefile.am
View File

@ -59,6 +59,7 @@ gncinclude_HEADERS = \
gnc-html-history.h \
gnc-html-guppi.h \
gnc-html.h \
gnc-mdi-utils.h \
gnc-menu-extensions.h \
gtkselect.h \
print-session.h

4
src/gnome-utils/gnc-amount-edit.h
View File

@ -26,8 +26,8 @@
@NOTATION@
*/
#ifndef __GNC_AMOUNT_EDIT_H_
#define __GNC_AMOUNT_EDIT_H_
#ifndef GNC_AMOUNT_EDIT_H
#define GNC_AMOUNT_EDIT_H
#include <gnome.h>

4
src/gnome-utils/gnc-commodity-edit.h
View File

@ -28,8 +28,8 @@
@NOTATION@
*/
#ifndef __GNC_COMMODITY_EDIT_H_
#define __GNC_COMMODITY_EDIT_H_ 1
#ifndef GNC_COMMODITY_EDIT_H
#define GNC_COMMODITY_EDIT_H
#include <gnome.h>

4
src/gnome-utils/gnc-currency-edit.h
View File

@ -28,8 +28,8 @@
@NOTATION@
*/
#ifndef __GNC_CURRENCY_EDIT_H_
#define __GNC_CURRENCY_EDIT_H_ 1
#ifndef GNC_CURRENCY_EDIT_H
#define GNC_CURRENCY_EDIT_H
#include <gnome.h>

4
src/gnome-utils/gnc-date-delta.h
View File

@ -28,8 +28,8 @@
@NOTATION@
*/
#ifndef __GNC_DATE_DELTA_H_
#define __GNC_DATE_DELTA_H_
#ifndef GNC_DATE_DELTA_H
#define GNC_DATE_DELTA_H
#include <gnome.h>

1
src/gnome-utils/gnc-html.c
View File

@ -56,7 +56,6 @@
#include "gnc-network.h"
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "window-main.h"
#include "messages.h"

54
src/gnome-utils/gnc-mdi-utils.h Normal file
View File

@ -0,0 +1,54 @@
/********************************************************************\
* gnc-mdi-utils.h -- utility functions for gnome/mdi *
* Copyright (C) 2001 Linux Developers Group *
* *
* 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 *
* 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
* Boston, MA 02111-1307, USA gnu@gnu.org *
* *
\********************************************************************/
#ifndef GNC_MDI_UTILS_H
#define GNC_MDI_UTILS_H
#include <gnome.h>
typedef struct
{
GnomeMDI * mdi;
int component_id;
SCM toolbar_change_callback_id;
SCM mdi_change_callback_id;
GList * children;
} GNCMDIInfo;
typedef struct
{
GnomeMDIChild * child;
GtkWidget * contents;
GnomeApp * app;
GtkWidget * toolbar;
GnomeUIInfo * toolbar_info;
int toolbar_size;
GnomeUIInfo * menu_info;
int component_id;
void * user_data;
char * title;
} GNCMDIChildInfo;
#endif

4
src/gnome-utils/print-session.h
View File

@ -21,8 +21,8 @@
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifndef __PRINT_SESSION_H_
#define __PRINT_SESSION_H_
#ifndef PRINT_SESSION_H
#define PRINT_SESSION_H
#include "config.h"

4
src/gnome/dialog-fincalc.h
View File

@ -20,8 +20,8 @@
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifndef __DIALOG_FINCALC_H_
#define __DIALOG_FINCALC_H_
#ifndef DIALOG_FINCALC_H
#define DIALOG_FINCALC_H
#include "config.h"

4
src/gnome/dialog-print-check.h
View File

@ -20,8 +20,8 @@
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifndef __DIALOG_PRINT_CHECK_H_
#define __DIALOG_PRINT_CHECK_H_
#ifndef DIALOG_PRINT_CHECK_H
#define DIALOG_PRINT_CHECK_H
#include "config.h"

4
src/gnome/dialog-scheduledxaction.h
View File

@ -20,8 +20,8 @@
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifndef __DIALOG_SCHEDULEDXACTION_H_
#define __DIALOG_SCHEDULEDXACTION_H_
#ifndef DIALOG_SCHEDULEDXACTION_H
#define DIALOG_SCHEDULEDXACTION_H
#include "config.h"
#include <gnome.h>

4
src/gnome/dialog-totd.h
View File

@ -20,8 +20,8 @@
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifndef __DIALOG_TOTD_H_
#define __DIALOG_TOTD_H_
#ifndef DIALOG_TOTD_H
#define DIALOG_TOTD_H
void gnc_ui_totd_dialog_create_and_run(void);

4
src/gnome/top-level.c
View File

@ -101,7 +101,7 @@ static void gnc_configure_register_hint_font(void);
/* This static indicates the debugging module that this .o belongs to. */
static short module = MOD_GUI;
static GNCMainInfo * app = NULL;
static GNCMDIInfo * app = NULL;
static int gnome_is_running = FALSE;
static int gnome_is_initialized = FALSE;
@ -131,7 +131,7 @@ gnucash_ui_is_terminating(void)
return gnome_is_terminating;
}
GNCMainInfo *
GNCMDIInfo *
gnc_ui_get_data (void)
{
return app;

2
src/gnome/top-level.h
View File

@ -31,7 +31,7 @@ gboolean gnucash_ui_is_running(void);
gboolean gnucash_ui_is_terminating(void);
int gnucash_ui_init(void);
GNCMainInfo * gnc_ui_get_data(void);
GNCMDIInfo * gnc_ui_get_data(void);
void gnc_ui_shutdown(void);
void gnc_ui_destroy(void);
int gnc_ui_start_event_loop(void);

38
src/gnome/window-acct-tree.c
View File

@ -88,7 +88,7 @@ struct GNCAcctTreeWin_p
static GtkWidget *
gnc_acct_tree_view_labeler(GnomeMDIChild * child, GtkWidget * current,
gpointer user_data) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = NULL;
char * name = NULL;
@ -127,7 +127,7 @@ gnc_acct_tree_view_labeler(GnomeMDIChild * child, GtkWidget * current,
static void
gnc_acct_tree_view_destroy(GtkObject * obj, gpointer user_data) {
GNCMainChildInfo * mc = user_data;
GNCMDIChildInfo * mc = user_data;
GNCAcctTreeWin * w = mc->user_data;
gnc_main_window_remove_child(gnc_ui_get_data(), mc);
@ -146,8 +146,8 @@ gnc_acct_tree_view_destroy(GtkObject * obj, gpointer user_data) {
static GtkWidget *
gnc_acct_tree_view_new(GnomeMDIChild * child, gpointer user_data) {
GNCMainInfo * maininfo = user_data;
GNCMainChildInfo * mc = g_new0(GNCMainChildInfo, 1);
GNCMDIInfo * maininfo = user_data;
GNCMDIChildInfo * mc = g_new0(GNCMDIChildInfo, 1);
GNCAcctTreeWin * win = gnc_acct_tree_window_new(child->name);
char * name;
@ -204,7 +204,7 @@ gnc_acct_tree_view_new(GnomeMDIChild * child, gpointer user_data) {
GnomeMDIChild *
gnc_acct_tree_window_create_child(const gchar * url) {
GNCMainInfo * maininfo = gnc_ui_get_data();
GNCMDIInfo * maininfo = gnc_ui_get_data();
GnomeMDIGenericChild * accountchild =
gnome_mdi_generic_child_new(url);
@ -225,7 +225,7 @@ gnc_acct_tree_window_create_child(const gchar * url) {
void
gnc_main_window_open_accounts(gint toplevel) {
GNCMainInfo * maininfo = gnc_ui_get_data();
GNCMDIInfo * maininfo = gnc_ui_get_data();
GnomeMDIChild * accountchild = gnc_acct_tree_window_create_child(NULL);
gnome_mdi_add_child(GNOME_MDI(maininfo->mdi),
GNOME_MDI_CHILD(accountchild));
@ -334,7 +334,7 @@ gnc_acct_tree_window_toolbar_delete_account_cb (GtkWidget *widget,
static void
gnc_acct_tree_window_menu_open_subs_cb(GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
RegWindow * regData;
@ -357,7 +357,7 @@ gnc_acct_tree_window_menu_open_subs_cb(GtkWidget * widget,
static void
gnc_acct_tree_window_menu_edit_cb (GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
@ -380,7 +380,7 @@ gnc_acct_tree_window_menu_edit_cb (GtkWidget * widget,
static void
gnc_acct_tree_window_menu_reconcile_cb(GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
RecnWindow * recnData;
@ -401,7 +401,7 @@ gnc_acct_tree_window_menu_reconcile_cb(GtkWidget * widget,
static void
gnc_acct_tree_window_menu_transfer_cb (GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
@ -411,7 +411,7 @@ gnc_acct_tree_window_menu_transfer_cb (GtkWidget * widget,
static void
gnc_acct_tree_window_menu_stock_split_cb (GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
@ -421,7 +421,7 @@ gnc_acct_tree_window_menu_stock_split_cb (GtkWidget * widget,
static void
gnc_acct_tree_window_menu_add_account_cb (GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
gnc_ui_new_account_window_with_default (NULL, account);
@ -430,7 +430,7 @@ gnc_acct_tree_window_menu_add_account_cb (GtkWidget * widget,
static void
gnc_acct_tree_window_menu_delete_account_cb (GtkWidget *widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
@ -466,7 +466,7 @@ gnc_acct_tree_window_menu_delete_account_cb (GtkWidget *widget,
static void
gnc_acct_tree_window_menu_tax_info_cb (GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
gnc_tax_info_dialog(GTK_WIDGET(mc->app));
@ -475,7 +475,7 @@ gnc_acct_tree_window_menu_tax_info_cb (GtkWidget * widget,
static void
gnc_acct_tree_window_menu_scrub_cb(GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
@ -497,7 +497,7 @@ gnc_acct_tree_window_menu_scrub_cb(GtkWidget * widget,
static void
gnc_acct_tree_window_menu_scrub_sub_cb(GtkWidget * widget,
GnomeMDIChild * child) {
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
@ -532,7 +532,7 @@ gnc_acct_tree_window_menu_scrub_all_cb(GtkWidget * widget,
static void
gnc_acct_tree_window_menu_open_cb (GtkWidget *widget, GnomeMDIChild * child)
{
GNCMainChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * mc = gtk_object_get_user_data(GTK_OBJECT(child));
GNCAcctTreeWin * win = mc->user_data;
Account * account = gnc_acct_tree_window_get_current_account(win);
RegWindow * regData;
@ -704,7 +704,7 @@ static void gnc_acct_tree_window_toolbar_options_cb(GtkWidget * w, gpointer d);
void
gnc_acct_tree_window_create_toolbar(GNCAcctTreeWin * win,
GNCMainChildInfo * child) {
GNCMDIChildInfo * child) {
GnomeUIInfo toolbar_template[] =
{
{ GNOME_APP_UI_ITEM,
@ -769,7 +769,7 @@ gnc_acct_tree_window_create_toolbar(GNCAcctTreeWin * win,
void
gnc_acct_tree_window_create_menu(GNCAcctTreeWin * main_info,
GNCMainChildInfo * child) {
GNCMDIChildInfo * child) {
GnomeUIInfo scrubmenu[] =
{
{

4
src/gnome/window-acct-tree.h
View File

@ -32,9 +32,9 @@ GNCAcctTreeWin * gnc_acct_tree_window_new(const gchar * url);
void gnc_acct_tree_window_destroy(GNCAcctTreeWin * win);
GtkWidget * gnc_acct_tree_window_get_widget(GNCAcctTreeWin * win);
void gnc_acct_tree_window_create_menu(GNCAcctTreeWin * win,
GNCMainChildInfo * child);
GNCMDIChildInfo * child);
void gnc_acct_tree_window_create_toolbar(GNCAcctTreeWin * win,
GNCMainChildInfo * child);
GNCMDIChildInfo * child);
Account * gnc_acct_tree_window_get_current_account(GNCAcctTreeWin * w);
GnomeMDIChild * gnc_acct_tree_window_create_child(const gchar * url);
void gnc_main_window_open_accounts(gint toplevel);

62
src/gnome/window-main.c
View File

@ -70,7 +70,7 @@
#define WINDOW_MAIN_CM_CLASS "window-main"
static void gnc_main_window_create_menus(GNCMainInfo * maininfo);
static void gnc_main_window_create_menus(GNCMDIInfo * maininfo);
/********************************************************************
* gnc_main_window_destroy_cb()
@ -90,8 +90,8 @@ gnc_main_window_destroy_cb(GtkObject * w, gpointer data) {
static void
gnc_main_window_app_destroyed_cb(GnomeApp * app, gpointer user_data) {
GNCMainInfo * mainwin = user_data;
GNCMainChildInfo * mc = NULL;
GNCMDIInfo * mainwin = user_data;
GNCMDIChildInfo * mc = NULL;
GnomeMDI * mdi = mainwin->mdi;
GtkWidget *toolbar;
GList * child;
@ -125,7 +125,7 @@ gnc_main_window_app_destroyed_cb(GnomeApp * app, gpointer user_data) {
static void
gnc_main_window_app_created_cb(GnomeMDI * mdi, GnomeApp * app,
gpointer data) {
GNCMainInfo * mainwin = data;
GNCMDIInfo * mainwin = data;
GtkWidget * summarybar;
GtkWidget * statusbar;
@ -187,7 +187,7 @@ gnc_main_window_app_created_cb(GnomeMDI * mdi, GnomeApp * app,
}
static void
gnc_main_window_child_set_title (GNCMainChildInfo *childwin)
gnc_main_window_child_set_title (GNCMDIChildInfo *childwin)
{
GNCBook *book;
const char *filename;
@ -216,8 +216,8 @@ gnc_main_window_child_set_title (GNCMainChildInfo *childwin)
static void
gnc_app_set_title (GnomeApp *app)
{
GNCMainChildInfo *childwin;
GNCMainInfo *mainwin;
GNCMDIChildInfo *childwin;
GNCMDIInfo *mainwin;
GnomeMDIChild *child;
GtkWidget *view;
@ -267,7 +267,7 @@ gnc_refresh_main_window_info (void)
static gboolean
gnc_main_window_child_remove_cb(GnomeMDI * mdi, GnomeMDIChild * child,
gpointer data) {
GNCMainInfo * mainwin = data;
GNCMDIInfo * mainwin = data;
return TRUE;
}
@ -281,8 +281,8 @@ gnc_main_window_child_remove_cb(GnomeMDI * mdi, GnomeMDIChild * child,
static void
gnc_main_window_child_changed_cb(GnomeMDI * mdi, GnomeMDIChild * not_used,
gpointer data) {
GNCMainInfo * mainwin = data;
GNCMainChildInfo * childwin = NULL;
GNCMDIInfo * mainwin = data;
GNCMDIChildInfo * childwin = NULL;
GnomeUIInfo * hintinfo;
GtkWidget * oldbar;
GnomeApp * new_app = NULL;
@ -381,8 +381,8 @@ gnc_main_window_child_changed_cb(GnomeMDI * mdi, GnomeMDIChild * not_used,
static void
gnc_main_window_configure_toolbar_cb (gpointer data)
{
GNCMainInfo * mi = data;
GNCMainChildInfo * mc = NULL;
GNCMDIInfo * mi = data;
GNCMDIChildInfo * mc = NULL;
GtkToolbarStyle tbstyle = gnc_get_toolbar_style();
GList * child;
@ -403,7 +403,7 @@ gnc_main_window_configure_toolbar_cb (gpointer data)
static void
gnc_main_window_configure_mdi_cb (gpointer data)
{
GNCMainInfo * mi = data;
GNCMDIInfo * mi = data;
GnomeMDIMode mode = gnc_get_mdi_mode();
gnome_mdi_set_mode(mi->mdi, mode);
@ -461,7 +461,7 @@ gnc_main_window_child_save_func(GnomeMDIChild * child, gpointer user_data) {
********************************************************************/
static gboolean
gnc_main_window_has_apps (GNCMainInfo * wind)
gnc_main_window_has_apps (GNCMDIInfo * wind)
{
GList *toplevels;
@ -479,7 +479,7 @@ gnc_main_window_has_apps (GNCMainInfo * wind)
}
gboolean
gnc_main_window_can_save (GNCMainInfo * wind)
gnc_main_window_can_save (GNCMDIInfo * wind)
{
if (!wind) return FALSE;
@ -487,7 +487,7 @@ gnc_main_window_can_save (GNCMainInfo * wind)
}
gboolean
gnc_main_window_can_cancel_save (GNCMainInfo *wind)
gnc_main_window_can_cancel_save (GNCMDIInfo *wind)
{
if (!wind) return FALSE;
@ -501,7 +501,7 @@ gnc_main_window_can_cancel_save (GNCMainInfo *wind)
********************************************************************/
void
gnc_main_window_save(GNCMainInfo * wind, char * filename) {
gnc_main_window_save(GNCMDIInfo * wind, char * filename) {
char * encoded;
char * session_name;
@ -524,7 +524,7 @@ gnc_main_window_save(GNCMainInfo * wind, char * filename) {
********************************************************************/
void
gnc_main_window_restore(GNCMainInfo * wind, const char * filename)
gnc_main_window_restore(GNCMDIInfo * wind, const char * filename)
{
char * encoded;
char * session_name;
@ -558,7 +558,7 @@ gnc_main_window_restore(GNCMainInfo * wind, const char * filename)
}
void
gnc_main_window_close_children(GNCMainInfo * wind) {
gnc_main_window_close_children(GNCMDIInfo * wind) {
gnome_mdi_remove_all(wind->mdi, FALSE);
}
@ -567,9 +567,9 @@ gnc_main_window_close_children(GNCMainInfo * wind) {
* initialize the Gnome MDI system
********************************************************************/
GNCMainInfo *
GNCMDIInfo *
gnc_main_window_new(void) {
GNCMainInfo * retval = g_new0(GNCMainInfo, 1);
GNCMDIInfo * retval = g_new0(GNCMDIInfo, 1);
retval->mdi = GNOME_MDI(gnome_mdi_new("GnuCash", "GnuCash"));
retval->component_id =
@ -620,7 +620,7 @@ gnc_main_window_new(void) {
********************************************************************/
void
gnc_main_window_add_child(GNCMainInfo * wind, GNCMainChildInfo * child) {
gnc_main_window_add_child(GNCMDIInfo * wind, GNCMDIChildInfo * child) {
wind->children = g_list_append(wind->children, child);
if(GNOME_IS_MDI_GENERIC_CHILD(child->child)) {
@ -636,7 +636,7 @@ gnc_main_window_add_child(GNCMainInfo * wind, GNCMainChildInfo * child) {
********************************************************************/
void
gnc_main_window_remove_child(GNCMainInfo * wind, GNCMainChildInfo * child) {
gnc_main_window_remove_child(GNCMDIInfo * wind, GNCMDIChildInfo * child) {
wind->children = g_list_remove(wind->children, child);
}
@ -646,19 +646,19 @@ gnc_main_window_remove_child(GNCMainInfo * wind, GNCMainChildInfo * child) {
********************************************************************/
void
gnc_main_window_destroy(GNCMainInfo * wind) {
gnc_main_window_destroy(GNCMDIInfo * wind) {
g_free(wind);
}
/********************************************************************
* gnc_main_window_child_refresh(GNCMainChildInfo * child)
* gnc_main_window_child_refresh(GNCMDIChildInfo * child)
* send an update event to the child
********************************************************************/
void
gnc_main_window_child_refresh(gpointer data) {
GNCMainChildInfo *child = data;
GNCMDIChildInfo *child = data;
gnome_mdi_child_set_name(child->child, child->child->name);
gnome_mdi_update_child(gnc_ui_get_data()->mdi, child->child);
@ -839,11 +839,11 @@ gnc_main_window_file_shutdown_cb(GtkWidget * widget) {
static void
gnc_main_window_file_close_cb(GtkWidget * widget, GnomeMDI * mdi) {
GNCMainChildInfo * inf;
GNCMDIChildInfo * inf;
if (!mdi)
{
GNCMainInfo *main_info;
GNCMDIInfo *main_info;
main_info = gnc_ui_get_data ();
if (!main_info) return;
@ -974,7 +974,7 @@ gnc_main_window_file_new_account_tree_cb(GtkWidget * w, GnomeMDI * mdi) {
}
static void
gnc_main_window_create_menus(GNCMainInfo * maininfo) {
gnc_main_window_create_menus(GNCMDIInfo * maininfo) {
static GnomeUIInfo gnc_file_menu_template[] =
{
GNOMEUIINFO_MENU_NEW_ITEM(N_("New _File"),
@ -1155,8 +1155,8 @@ gnc_main_window_create_menus(GNCMainInfo * maininfo) {
********************************************************************/
void
gnc_main_window_create_child_toolbar(GNCMainInfo * mi,
GNCMainChildInfo * child) {
gnc_main_window_create_child_toolbar(GNCMDIInfo * mi,
GNCMDIChildInfo * child) {
GnomeUIInfo pre_tb[] =
{
{ GNOME_APP_UI_ITEM,

50
src/gnome/window-main.h
View File

@ -27,45 +27,23 @@
#include <gnome.h>
#include <guile/gh.h>
typedef struct {
GnomeMDI * mdi;
int component_id;
SCM toolbar_change_callback_id;
SCM mdi_change_callback_id;
GList * children;
} GNCMainInfo;
#include "gnc-mdi-utils.h"
typedef struct {
GnomeMDIChild * child;
GtkWidget * contents;
GnomeApp * app;
GtkWidget * toolbar;
GnomeUIInfo * toolbar_info;
int toolbar_size;
GnomeUIInfo * menu_info;
int component_id;
void * user_data;
char * title;
} GNCMainChildInfo;
GNCMainInfo * gnc_main_window_new(void);
void gnc_main_window_destroy(GNCMainInfo * wind);
gboolean gnc_main_window_can_save(GNCMainInfo * wind);
gboolean gnc_main_window_can_cancel_save (GNCMainInfo *wind);
void gnc_main_window_save(GNCMainInfo * wind, char * session);
void gnc_main_window_restore(GNCMainInfo * wind,
GNCMDIInfo * gnc_main_window_new(void);
void gnc_main_window_destroy(GNCMDIInfo * wind);
gboolean gnc_main_window_can_save(GNCMDIInfo * wind);
gboolean gnc_main_window_can_cancel_save (GNCMDIInfo *wind);
void gnc_main_window_save(GNCMDIInfo * wind, char * session);
void gnc_main_window_restore(GNCMDIInfo * wind,
const char * session);
void gnc_main_window_create_child_toolbar(GNCMainInfo * mi,
GNCMainChildInfo * child);
void gnc_main_window_add_child(GNCMainInfo * main,
GNCMainChildInfo * child);
void gnc_main_window_remove_child(GNCMainInfo * main,
GNCMainChildInfo * child);
void gnc_main_window_create_child_toolbar(GNCMDIInfo * mi,
GNCMDIChildInfo * child);
void gnc_main_window_add_child(GNCMDIInfo * main,
GNCMDIChildInfo * child);
void gnc_main_window_remove_child(GNCMDIInfo * main,
GNCMDIChildInfo * child);
void gnc_main_window_child_refresh(gpointer data);
GnomeMDIChild * gnc_main_window_create_child(const gchar * configstring);
void gnc_main_window_close_children(GNCMainInfo * main);
void gnc_main_window_close_children(GNCMDIInfo * main);
#endif

22
src/gnome/window-report.c
View File

@ -49,7 +49,7 @@
#define WINDOW_REPORT_CM_CLASS "window-report"
struct _gnc_report_window {
GNCMainChildInfo * mc;
GNCMDIChildInfo * mc;
GtkWidget * container;
/* the report that's currently being shown. For any option change
@ -91,7 +91,7 @@ static gint last_height = 0;
static GtkWidget *
gnc_report_window_view_labeler(GnomeMDIChild * child, GtkWidget * current,
gpointer user_data) {
GNCMainChildInfo * rwin = gtk_object_get_user_data(GTK_OBJECT(child));
GNCMDIChildInfo * rwin = gtk_object_get_user_data(GTK_OBJECT(child));
gnc_report_window * report;
SCM get_name = gh_eval_str("gnc:report-name");
char * name = NULL;
@ -127,7 +127,7 @@ gnc_report_window_view_labeler(GnomeMDIChild * child, GtkWidget * current,
static void
gnc_report_window_view_destroy(GtkObject * obj, gpointer user_data) {
GNCMainChildInfo * mc = user_data;
GNCMDIChildInfo * mc = user_data;
gnc_report_window * w = mc->user_data;
gnc_main_window_remove_child(gnc_ui_get_data(), mc);
g_free(mc->toolbar_info);
@ -143,8 +143,8 @@ gnc_report_window_view_destroy(GtkObject * obj, gpointer user_data) {
static GtkWidget *
gnc_report_window_view_new(GnomeMDIChild * child, gpointer user_data) {
GNCMainInfo * maininfo = user_data;
GNCMainChildInfo * mc = g_new0(GNCMainChildInfo, 1);
GNCMDIInfo * maininfo = user_data;
GNCMDIChildInfo * mc = g_new0(GNCMDIChildInfo, 1);
gnc_report_window * win = gnc_report_window_new(mc);
URLType type;
char * url_location = NULL;
@ -197,7 +197,7 @@ GnomeMDIChild *
gnc_report_window_create_child(const gchar * configstring) {
GnomeMDIGenericChild * reportchild =
gnome_mdi_generic_child_new(configstring);
GNCMainInfo * maininfo = gnc_ui_get_data();
GNCMDIInfo * maininfo = gnc_ui_get_data();
gnome_mdi_generic_child_set_label_func(reportchild,
gnc_report_window_view_labeler,
@ -224,7 +224,7 @@ gnc_main_window_open_report(int report_id, gint toplevel) {
void
gnc_main_window_open_report_url(const char * url, gint toplevel) {
GnomeMDIChild * reportchild = gnc_report_window_create_child(url);
GNCMainInfo * maininfo = gnc_ui_get_data();
GNCMDIInfo * maininfo = gnc_ui_get_data();
gnome_mdi_add_child(GNOME_MDI(maininfo->mdi),
GNOME_MDI_CHILD(reportchild));
@ -233,7 +233,7 @@ gnc_main_window_open_report_url(const char * url, gint toplevel) {
GNOME_MDI_CHILD(reportchild));
}
else {
GNCMainChildInfo * childwin;
GNCMDIChildInfo * childwin;
gnome_mdi_add_view(GNOME_MDI(maininfo->mdi),
GNOME_MDI_CHILD(reportchild));
@ -590,7 +590,7 @@ close_handler (gpointer user_data)
********************************************************************/
gnc_report_window *
gnc_report_window_new(GNCMainChildInfo * mc) {
gnc_report_window_new(GNCMDIChildInfo * mc) {
gnc_report_window * report = g_new0(gnc_report_window, 1);
GtkObject * tlo;
@ -642,7 +642,7 @@ gnc_report_window_new(GNCMainChildInfo * mc) {
void
gnc_report_window_create_toolbar(gnc_report_window * win,
GNCMainChildInfo * child) {
GNCMDIChildInfo * child) {
GnomeUIInfo toolbar_data[] =
{
{ GNOME_APP_UI_ITEM,
@ -724,7 +724,7 @@ gnc_report_window_create_toolbar(gnc_report_window * win,
********************************************************************/
void
gnc_report_window_create_menu(gnc_report_window * report,
GNCMainChildInfo * child) {
GNCMDIChildInfo * child) {
child->menu_info = NULL;
}

6
src/gnome/window-report.h
View File

@ -34,7 +34,7 @@ typedef struct _gnc_report_window gnc_report_window;
/** PROTOTYPES ******************************************************/
gnc_report_window * gnc_report_window_new(GNCMainChildInfo * mc);
gnc_report_window * gnc_report_window_new(GNCMDIChildInfo * mc);
void gnc_report_window_destroy(gnc_report_window * rep);
void gnc_report_window_show_report(gnc_report_window * rw, int id);
void gnc_report_window_reload(gnc_report_window * rw);
@ -43,9 +43,9 @@ GtkWidget * gnc_report_window_get_container(gnc_report_window * rw);
SCM gnc_report_window_get_report(gnc_report_window * rw);
void gnc_report_window_create_menu(gnc_report_window * report,
GNCMainChildInfo * child);
GNCMDIChildInfo * child);
void gnc_report_window_create_toolbar(gnc_report_window * report,
GNCMainChildInfo * child);
GNCMDIChildInfo * child);
GtkWidget * gnc_report_window_default_params_editor(SCM options, SCM report);

6
src/import-export/qif-import/dialog-account-picker.h
View File

@ -21,15 +21,15 @@
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifndef __DIALOG_ACCOUNT_PICKER_H_
#define __DIALOG_ACCOUNT_PICKER_H_
#ifndef DIALOG_ACCOUNT_PICKER_H
#define DIALOG_ACCOUNT_PICKER_H
#include <guile/gh.h>
#include "druid-qif-import.h"
SCM qif_account_picker_dialog(QIFImportWindow * wind, SCM initial_sel);
typedef struct _accountpickerdialog QIFAccountPickerDialog;
#endif

4
src/optional/swig/helperfuncs.h
View File

@ -1,5 +1,5 @@
#ifndef __HELPERFUNCS_H__
#define __HELPERFUNCS_H__
#ifndef HELPERFUNCS_H
#define HELPERFUNCS_H
#include <stdio.h>

4
src/register/register-core/formulacell.h
View File

@ -53,8 +53,8 @@
* Copyright (c) 2001 Joshua Sled <jsled@asynchronous.org>
**/
#ifndef __FORMULA_CELL_C__
#define __FORMULA_CELL_C__
#ifndef FORMULA_CELL_C
#define FORMULA_CELL_C
#include <time.h>