2003.05.17 
    - MySQL 4.0対応
    - 日本語対応

diff -Ndur dbmetrix-0.1.9.orig/src/gtk.c dbmetrix-0.1.9-cur/src/gtk.c
--- dbmetrix-0.1.9.orig/src/gtk.c	Fri Jul 30 23:43:24 1999
+++ dbmetrix-0.1.9-cur/src/gtk.c	Fri May 16 23:51:44 2003
@@ -85,8 +85,8 @@
     dWindow = gtk_dialog_new();
     gtk_window_set_title(GTK_WINDOW(dWindow), "New Database");
     gtk_widget_set_usize(GTK_DIALOG(dWindow)->action_area, -1, 32);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
     gtk_widget_show(dWindow);
 
     /* action area buttons */
@@ -450,8 +450,8 @@
     dWindow = gtk_dialog_new();
     gtk_window_set_title(GTK_WINDOW(dWindow), title_window ? title_window : "Properties");
     gtk_widget_set_usize(GTK_DIALOG(dWindow)->action_area, -1, 32);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
     gtk_widget_show(dWindow);
 
     button = gtk_button_new_with_label("Ok");
diff -Ndur dbmetrix-0.1.9.orig/src/main.c dbmetrix-0.1.9-cur/src/main.c
--- dbmetrix-0.1.9.orig/src/main.c	Wed Dec 30 20:55:51 1998
+++ dbmetrix-0.1.9-cur/src/main.c	Fri May 16 23:55:09 2003
@@ -77,8 +77,8 @@
     dWindow = gtk_dialog_new();
     gtk_window_set_title(GTK_WINDOW(dWindow), "About dbMetrix");
     gtk_widget_set_usize(GTK_DIALOG(dWindow)->action_area, -1, 32);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
     gtk_widget_show(dWindow);
 
     button = gtk_button_new_with_label("Cancel");
@@ -121,7 +121,7 @@
     dsClass ds_class;
 
     notebook = get_widget(widget, "notebook");
-    curpage = gtk_notebook_current_page(GTK_NOTEBOOK(notebook));
+    curpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
     g_snprintf(pagekey, 8, "%d", curpage);
     ds_class = (dsClass)gtk_object_get_data(GTK_OBJECT(widget), pagekey);
 
@@ -143,8 +143,8 @@
     /* dialog as a whole */
     dWindow = gtk_dialog_new();
     gtk_window_set_title(GTK_WINDOW(dWindow), "Add Data Source");
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 2);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 2);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
 
     /* action area buttons */
     button = gtk_button_new_with_label("Connect");
@@ -256,7 +256,7 @@
 
     /* horizontal pane */
     hPane = gtk_hpaned_new();
-    gtk_container_border_width(GTK_CONTAINER(hPane), 1);
+    gtk_container_set_border_width(GTK_CONTAINER(hPane), 1);
     gtk_box_pack_start(GTK_BOX(vBox), hPane, TRUE, TRUE, 0);
     gtk_widget_show(hPane);
 
@@ -267,7 +267,7 @@
 
     scrollbars = gtk_scrolled_window_new(NULL, NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollbars), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    gtk_container_border_width(GTK_CONTAINER(scrollbars), 1);
+    gtk_container_set_border_width(GTK_CONTAINER(scrollbars), 1);
     gtk_container_add(GTK_CONTAINER(frame), scrollbars);
     gtk_widget_show(scrollbars);
 
@@ -474,6 +474,7 @@
 main(int argc, char *argv[])
 {
     GtkWidget *mWindow;
+    gtk_set_locale();
     gtk_init(&argc, &argv);
     pref_init(argc, argv);
 
diff -Ndur dbmetrix-0.1.9.orig/src/mysql.c dbmetrix-0.1.9-cur/src/mysql.c
--- dbmetrix-0.1.9.orig/src/mysql.c	Thu Sep 17 06:12:13 1998
+++ dbmetrix-0.1.9-cur/src/mysql.c	Fri May 16 23:51:41 2003
@@ -96,6 +96,18 @@
     create_dialogs(dWindow, notebook, curpage, MySQL, "MySQL", entries, sizeof(entries)/sizeof(entries[0]));
 }
 
+static MYSQL*
+my_mysql_connect(MYSQL* mysql, const char* host, const char* user, const char* passwd)
+{
+    MYSQL* res;
+    mysql = mysql_init(mysql);
+    if (!(res = mysql_real_connect(mysql, host, user, passwd, NULL, 0, NULL, 0))) {
+//        if (mysql->free_me)
+//            my_free(mysql, 0);
+    }
+    return res;
+}
+
 void
 create_MySQL_dsEntry(GtkWidget *widget)
 {
@@ -123,7 +135,7 @@
 
     /* connect to server */
     dbconn = DBX_MYSQL(g_malloc(sizeof(dbx_MySQL)));
-    if (mysql_connect(&dbconn->conn, host, user, pass))
+    if (my_mysql_connect(&dbconn->conn, host, user, pass))
     {
         dbconn->host = g_strdup(host);
         dbconn->user = g_strdup(user);
@@ -142,7 +154,7 @@
 create_db_MySQL(dataSource *conn, char *database)
 {
     dbx_MySQL *dbconn = DBX_MYSQL(conn->info);
-    if (mysql_create_db(&dbconn->conn, database))
+    if (simple_command(&dbconn->conn, COM_CREATE_DB, database, strlen(database), 0))
     {
         s_print(mysql_error(&dbconn->conn));
         return(FALSE);
@@ -216,8 +228,8 @@
     dWindow = gtk_dialog_new();
     gtk_window_set_title(GTK_WINDOW(dWindow), "Change MySQL Password");
     gtk_widget_set_usize(GTK_DIALOG(dWindow)->action_area, -1, 32);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
     gtk_widget_show(dWindow);
     gtk_object_set_data(GTK_OBJECT(dWindow), "conn", conn);
 
@@ -239,7 +251,7 @@
 drop_db_MySQL(dataSource *conn, char *database)
 {
     dbx_MySQL *dbconn = DBX_MYSQL(conn->info);
-    if (mysql_drop_db(&dbconn->conn, database))
+    if (simple_command(&dbconn->conn, COM_DROP_DB, database, strlen(database), 0))
     {
         s_print(mysql_error(&dbconn->conn));
         return(FALSE);
@@ -422,7 +434,7 @@
     tLayout = gtk_table_new(10, 2, FALSE);
     gtk_table_set_row_spacings(GTK_TABLE(tLayout), 1);
     gtk_table_set_col_spacings(GTK_TABLE(tLayout), 3);
-    gtk_container_border_width(GTK_CONTAINER(tLayout), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(tLayout), 4);
 
     label = gtk_label_new("Information");
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tLayout, label);
diff -Ndur dbmetrix-0.1.9.orig/src/query.c dbmetrix-0.1.9-cur/src/query.c
--- dbmetrix-0.1.9.orig/src/query.c	Wed Sep 16 23:14:43 1998
+++ dbmetrix-0.1.9-cur/src/query.c	Fri May 16 23:56:05 2003
@@ -40,7 +40,7 @@
 void
 query_close(GtkWidget *widget, gpointer data)
 {
-    int curpage = gtk_notebook_current_page(GTK_NOTEBOOK(qbNotebook));
+    int curpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(qbNotebook));
     GtkWidget *nbPage;
     node_query *queryInfo = NULL;
 
@@ -240,7 +240,7 @@
     query_set_names(queryInfo, file);
     query_save(NULL, queryInfo);
     if (queryInfo->modified_since_save)
-        gtk_label_set(GTK_LABEL(nbPage->tab_label), queryInfo->title);
+        gtk_label_set_text(GTK_LABEL(nbPage->tab_label), queryInfo->title);
 
     gtk_widget_destroy(file_selection);
 }
@@ -295,8 +295,8 @@
     dWindow = gtk_dialog_new();
     gtk_window_set_title(GTK_WINDOW(dWindow), "Query Result");
     gtk_widget_set_usize(GTK_DIALOG(dWindow)->action_area, -1, 32);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
-    gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->action_area), 4);
+    gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dWindow)->vbox), 4);
     gtk_widget_show(dWindow);
 
     /* action area buttons */