patches 604726 and 655057 and more gmdb2 work

src/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

src/gmdb/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.deps
+.libs
+gmdb

src/gmdb2/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.deps
+.libs
+gmdb2

src/gmdb2/main2.c

@@ -7,6 +7,8 @@ GtkWidget *app;
 GladeXML *mainwin_xml;
 MdbSQL *sql;
 
+gmdb_table_popup_cb(GtkWidget *button, GdkEvent *event);
+
 /* called when the user closes the window */
 static gint
 delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
@@ -31,7 +33,7 @@ const gchar *documenters[] = {
 };
 GdkPixbuf *pixbuf;
 
-pixbuf = gdk_pixbuf_new_from_file ("logo.gif", NULL);
+pixbuf = gdk_pixbuf_new_from_file ("logo.xpm", NULL);
 
 gtk_widget_show (gnome_about_new ("Gnome MDB Viewer", "0.2",
                  "Copyright 2002-2003 Brian Bruns",
@@ -105,8 +107,10 @@ int pos;
 	gil = glade_xml_get_widget (mainwin_xml, "module_iconlist");
 	gnome_icon_list_clear(gil);
 }
+	
 void gmdb_init_popups()
 {
+		gmdb_table_init_popup();
 }
 
 int main(int argc, char *argv[]) 

src/gmdb2/table.c

@@ -73,8 +73,58 @@ gchar *text;
 		}
 	}
 }
+gmdb_table_popup_cb(GtkWidget *menu, GdkEvent *event)
+{
+GdkEventButton *event_button;
+//GtkWidget *menu;
+	
+	if (event->type == GDK_BUTTON_PRESS) {
+		event_button = (GdkEventButton *) event;
+		if (event_button->button == 3) {
+			gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 
+				event_button->button, event_button->time);
+	        	g_print("button press\n");
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
 /* functions */
 void
+gmdb_table_init_popup()
+{
+GnomeIconList *gil;
+GtkWidget *menu, *mi;
+
+	gil = glade_xml_get_widget (mainwin_xml, "table_iconlist");
+
+	menu = gtk_menu_new();
+	gtk_widget_show(menu);
+	mi = gtk_menu_item_new_with_label("Definition");
+	gtk_widget_show(mi);
+	g_signal_connect_swapped (G_OBJECT (mi), "activate",
+		G_CALLBACK (gmdb_table_def_cb), gil);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+	mi = gtk_menu_item_new_with_label("Data");
+	gtk_widget_show(mi);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+	mi = gtk_menu_item_new_with_label("Export");
+	gtk_widget_show(mi);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+	mi = gtk_separator_menu_item_new();
+	gtk_widget_show(mi);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+	mi = gtk_menu_item_new_with_label("Debug");
+	gtk_widget_show(mi);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+	mi = gtk_menu_item_new_with_label("Usage Map");
+	gtk_widget_show(mi);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+
+	g_signal_connect_swapped (GTK_OBJECT (gil), "button_press_event",
+		G_CALLBACK (gmdb_table_popup_cb), GTK_OBJECT(menu));
+}	
+void
 gmdb_table_add_icon(gchar *text)
 {
 GnomeIconList *gil;

src/libmdb/.cvsignore

@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la

src/odbc/.cvsignore

@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
+unittest

src/odbc/Makefile.am

@@ -1,4 +1,3 @@
-if HAVE_ODBC
 include_HEADERS = connectparams.h
 SQLDIR         =    ../sql
 SQLSOURCES     =    mdbsql.c parser.c lexer.c
@@ -19,4 +18,3 @@ unittest_LDADD	=	libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
 ## Need blank statement to avoid compiling odbc.c
 odbc: $(EXTRA_LTLIBRARIES)
 	@echo ''
-endif

src/sql/.cvsignore

@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+.deps
+.libs
+parser.c
+parser.h
+*.lo
+*.la

src/util/.cvsignore

@@ -0,0 +1,17 @@
+Makefile
+Makefile.in
+.deps
+.libs
+mdb-array
+mdb-export
+mdb-header
+mdb-parsecsv
+mdb-schema
+mdb-sql
+mdb-tables
+mdb-ver
+prcat
+prdata
+prdump
+prkkd
+prtable

src/util/updrow.c

@@ -20,6 +20,8 @@
 
 #include "mdbtools.h"
 
+void read_to_row(MdbTableDef *table, char *sargname);
+
 main(int argc, char **argv)
 {
 int rows;