diff -ur mysql-query-browser-1.1.7/mysql-gui-common/source/linux/MGBlobEditor.cc mysql-query-browser-1.1.7.new/mysql-gui-common/source/linux/MGBlobEditor.cc --- mysql-query-browser-1.1.7/mysql-gui-common/source/linux/MGBlobEditor.cc 2005-04-14 16:59:06.000000000 -0500 +++ mysql-query-browser-1.1.7.new/mysql-gui-common/source/linux/MGBlobEditor.cc 2005-05-01 16:00:18.000000000 -0500 @@ -76,7 +76,7 @@ { Path path; - path.push_back((int)iter.gobj()->user_data); + path.push_back((long)iter.gobj()->user_data); return path; } @@ -86,9 +86,9 @@ { iter->stamp= 1234; - iter->user_data= (gpointer)((int)iter->user_data+1); + iter->user_data= (gpointer)((long)iter->user_data+1); - return (int)iter->user_data < iter_n_children_vfunc(iter); + return (long)iter->user_data < iter_n_children_vfunc(iter); } @@ -118,7 +118,7 @@ void MGBlobListStore::get_value_vfunc(const Gtk::TreeModel::iterator& iter, int column, GValue* value) { char buffer[_bytes_per_row * 4]; - unsigned int line_num= (unsigned int)iter.gobj()->user_data; + unsigned int line_num= (unsigned long)iter.gobj()->user_data; g_value_init(value, G_TYPE_STRING); diff -ur mysql-query-browser-1.1.7/mysql-query-browser/source/linux/MGResultSetModel.cc mysql-query-browser-1.1.7.new/mysql-query-browser/source/linux/MGResultSetModel.cc --- mysql-query-browser-1.1.7/mysql-query-browser/source/linux/MGResultSetModel.cc 2005-04-28 10:44:47.000000000 -0500 +++ mysql-query-browser-1.1.7.new/mysql-query-browser/source/linux/MGResultSetModel.cc 2005-05-01 16:03:04.000000000 -0500 @@ -90,12 +90,12 @@ { iter->stamp= _stamp; - iter->user_data= (gpointer)((int)iter->user_data+1); + iter->user_data= (gpointer)((long)iter->user_data+1); // if ((unsigned)iter->user_data > _resultset->rows_num) // g_message("QEWQWE!!!"); - return (int)iter->user_data < (int)_resultset->rows_num+_new_rows ? true : false; + return (long)iter->user_data < (long)_resultset->rows_num+_new_rows ? true : false; } iter->stamp= 0; return false; @@ -171,7 +171,7 @@ { Path path; - path.push_back((int)iter.gobj()->user_data); + path.push_back((long)iter.gobj()->user_data); return path; } @@ -215,9 +215,9 @@ if (_disable_checks || treeiter_valid(iter)) { - int r= (int)iter->user_data; + int r= (long)iter->user_data; - if (column < (int)_resultset->columns_num*2) + if (column < (long)_resultset->columns_num*2) { // check if there's some changed version of the data switch (column % 2) @@ -231,7 +231,7 @@ return true; } - if ((unsigned int)iter->user_data < _resultset->rows_num) + if ((unsigned long)iter->user_data < _resultset->rows_num) { MYX_RS_ROW *row= _resultset->rows + r; @@ -316,7 +316,7 @@ if (_disable_checks || treeiter_valid(iter)) { - int r= (int)iter->user_data; + int r= (long)iter->user_data; // from 0 to 2*_resultset->columns_num, the columns correspond // to the content (text or blob ptr) and color of the resultset, @@ -415,7 +415,7 @@ switch ((column%2)) { case 0: - add_change((unsigned int)row.gobj()->user_data, column/2, value, value_length); + add_change((unsigned long)row.gobj()->user_data, column/2, value, value_length); break; case 1: // color, ignore @@ -482,7 +482,7 @@ MYX_RS_ROW *MGResultSetModel::get_iter_row(const Gtk::TreeModel::iterator &iter) { - return _resultset->rows + (int)iter.gobj()->user_data; + return _resultset->rows + (long)iter.gobj()->user_data; } @@ -660,7 +660,7 @@ void MGResultSetModel::erase(const Gtk::TreeModel::iterator &iter) { - unsigned int row= (unsigned int)iter.gobj()->user_data; + unsigned int row= (unsigned long)iter.gobj()->user_data; MYX_RS_ACTION *action; int index; @@ -676,7 +676,7 @@ void MGResultSetModel::undo(const Gtk::TreeModel::iterator &iter) { - int row= (int)iter.gobj()->user_data; + int row= (long)iter.gobj()->user_data; if (_actions.find(row)==_actions.end()) { @@ -719,7 +719,7 @@ bool MGResultSetModel::row_undoable(const Gtk::TreeModel::iterator &iter) { - int row= (int)iter.gobj()->user_data; + int row= (long)iter.gobj()->user_data; if (_actions.find(row)==_actions.end()) return false; return true;