diff --git a/src/register/Makefile.in b/src/register/Makefile.in index 3a9e96984b..b6b842785c 100644 --- a/src/register/Makefile.in +++ b/src/register/Makefile.in @@ -45,7 +45,7 @@ COMMON_SRCS := basiccell.c cellblock.c \ table-allgui.c table-html.c textcell.c MOTIF_SRCS := table-motif.c combocell-motif.c GNOME_SRCS := table-gtk.c combocell-gtk.c -QT_SRCS := +QT_SRCS := table-qt.cpp combocell-qt.cpp ###################################################################### all: diff --git a/src/register/table-allgui.c b/src/register/table-allgui.c index 866273c647..b8ab4090a2 100644 --- a/src/register/table-allgui.c +++ b/src/register/table-allgui.c @@ -33,6 +33,10 @@ #include "table-allgui.h" #include "util.h" +#ifdef KDE +#define TRUE (1==1) +#endif + static void xaccFreeTableEntries (Table * table); static void xaccTableResize (Table * table, int new_phys_rows, int new_phys_cols, diff --git a/src/register/table-allgui.h b/src/register/table-allgui.h index 5c93bb1db0..241c071649 100644 --- a/src/register/table-allgui.h +++ b/src/register/table-allgui.h @@ -66,6 +66,7 @@ #include "table-qt.h" #endif + #include "basiccell.h" #include "cellblock.h" diff --git a/src/register/table-qt.cpp b/src/register/table-qt.cpp index 93755a3e50..c33fce1c52 100755 --- a/src/register/table-qt.cpp +++ b/src/register/table-qt.cpp @@ -27,22 +27,41 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * \********************************************************************/ +extern "C" { + #include #include #include +#include "cellblock.h" +#include "table-allgui.h" + /* This static indicates the debugging module that this .o belongs to. */ -static short module = MOD_QT_REG; +// static short module = MOD_QT_REG; /* ==================================================== */ void -xaccNextTabGroup (Table *table, GtkWidget * w) { - table->next_tab_group = w; +xaccNextTabGroup (Table *table, void * w) { +// table->next_tab_group = w; } /* ==================================================== */ +void +doRefreshCursorGUI (Table * table, CellBlock *curs, int from_row, int from_col) +{ +} + +void +xaccCreateCursor (Table *table, CellBlock *curs) +{ +} + +void +xaccRefreshTableGUI (Table * table) { +} + #if 0 static int @@ -165,8 +184,8 @@ cell_left(Table *table, const int row, const int col) { /* ==================================================== */ -QWidget * -xaccCreateTable (Table *table, QWidget *parent) { +void * +xaccCreateTable (Table *table, void *parent) { return NULL; } @@ -266,6 +285,10 @@ doRefreshCursorGUI (Table * table, CellBlock *curs, int from_row, int from_col) } } + +#endif + +} /* ================== end of file ======================= */ diff --git a/src/register/table-qt.h b/src/register/table-qt.h index 8f3cdd8451..dbcbd2910e 100755 --- a/src/register/table-qt.h +++ b/src/register/table-qt.h @@ -31,8 +31,6 @@ #ifndef __XACC_TABLE_QT_H__ #define __XACC_TABLE_QT_H__ -#include - #define TABLE_PRIVATE_DATA #define TABLE_PRIVATE_DATA_INIT(table) {} @@ -44,9 +42,9 @@ typedef struct _Table Table; -/* create the GtkWidget */ -QWidget *xaccCreateTable (Table *, QWidget *parent); -void xaccNextTabGroup (Table *, QWidget*); +/* create the QT Widget */ +void *xaccCreateTable (Table *, void *parent); +void xaccNextTabGroup (Table *, void*); /* redraw the table GUI */ void xaccRefreshTableGUI (Table *);