Fixed unixODBC 2.1.0+ bug.

fixed GTK/Gnome handling.
more debugger stuff.
This commit is contained in:
brianb
2002-04-14 23:35:39 +00:00
parent 0d0e0efbb7
commit e7927f94bc
27 changed files with 443 additions and 205 deletions

View File

@@ -1,10 +1,16 @@
if HAVE_GTK
bin_PROGRAMS = gmdb
include_HEADERS = gmdb.h gtkhlist.h debug.xpm forms.xpm macros.xpm pk.xpm \
table.xpm query.xpm code.xpm reports.xpm
gmdb_SOURCES = debug.c file.c form.c gtkhlist.c info.c macro.c main.c \
module.c query.c report.c sql.c table.c table_data.c table_def.c \
table_export.c util.c
LIBS = $(GTK_LIBS) @LEXLIB@
INCLUDES = -I$(top_srcdir)/include $(GTK_CFLAGS)
LDADD = ../libmdb/libmdb.la
if SQL
gmdb_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
LIBS = $(GMDB_LIBS) @LEXLIB@
INCLUDES = -I$(top_srcdir)/include $(GMDB_CFLAGS)
#LDADD = ../libmdb/libmdb.la
LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
#if SQL
#gmdb_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
#endif
endif

View File

@@ -95,19 +95,31 @@ int i;
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * start_row + start_col,
dbug->linesz * start_row + end_col + 2);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * start_row + 59 + (range->start_byte % 16),
dbug->linesz * start_row + 59 + (range->end_byte % 16) + 1);
} else {
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * start_row + start_col,
/* 55 = 8 (addr) + 15 (bytes) * 3 (%02x " ") + 2 (last byte) */
dbug->linesz * start_row + 55);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * start_row + 59 + (range->start_byte % 16),
dbug->linesz * start_row + 75);
for (i=start_row + 1; i < end_row; i++) {
gmdb_debug_redraw(dbug->textbox, dbug->font,
&dbug->white, &dbug->black,
dbug->linesz * i + 8, dbug->linesz * i + 55);
gmdb_debug_redraw(dbug->textbox, dbug->font,
&dbug->white, &dbug->black,
dbug->linesz * i + 59, dbug->linesz * i + 75);
}
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * end_row + 8,
dbug->linesz * end_row + end_col + 2);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->white, &dbug->black,
dbug->linesz * end_row + 59,
dbug->linesz * end_row + 59 + (range->end_byte % 16) + 1);
}
gtk_text_thaw(GTK_TEXT(dbug->textbox));
}
@@ -132,19 +144,31 @@ int i;
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * start_row + start_col,
dbug->linesz * start_row + end_col + 2);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * start_row + 59 + (range->start_byte % 16),
dbug->linesz * start_row + 59 + (range->end_byte % 16) + 1);
} else {
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * start_row + start_col,
/* 55 = 8 (addr) + 15 (bytes) * 3 (%02x " ") + 2 (last byte) */
dbug->linesz * start_row + 55);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * start_row + 59 + (range->start_byte % 16),
dbug->linesz * start_row + 75);
for (i=start_row + 1; i < end_row; i++) {
gmdb_debug_redraw(dbug->textbox, dbug->font,
&dbug->black, &dbug->white,
dbug->linesz * i + 8, dbug->linesz * i + 55);
gmdb_debug_redraw(dbug->textbox, dbug->font,
&dbug->black, &dbug->white,
dbug->linesz * i + 59, dbug->linesz * i + 75);
}
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * end_row + 8,
dbug->linesz * end_row + end_col + 2);
gmdb_debug_redraw(dbug->textbox, dbug->font, &dbug->black, &dbug->white,
dbug->linesz * end_row + 59,
dbug->linesz * end_row + 59 + (range->end_byte % 16) + 1);
}
}
void

View File

@@ -242,8 +242,10 @@ gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
#endif
#ifdef SQL
/* initialize the SQL engine */
sql = mdb_sql_init();
#endif
/* initialize MDB Tools library */
mdb_init();
@@ -314,8 +316,10 @@ gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
/* enter the main loop */
gtk_main ();
#ifdef SQL
/* free MDB Tools library */
mdb_sql_exit(sql);
#endif
mdb_exit();
return 0;