Applied [ 880011 ] Several fixes to DbBrowse demo

ABX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-02-08 11:53:48 +00:00
parent 2321962672
commit 74de91cc97
10 changed files with 457 additions and 457 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -19,7 +19,7 @@
enum DialogModes {mView,mCreate,mEdit,mSearch};
// ID for the menu quit command
#define FILE_CREATE 100
#define FILE_CREATE_ID 100
#define FILE_RECREATE_TABLE 110
#define FILE_RECREATE_INDEXES 120
#if wxUSE_NEW_GRID
@@ -39,7 +39,7 @@ enum DialogModes {mView,mCreate,mEdit,mSearch};
#endif
// Name of the table to be created/opened
const wxChar CONTACT_TABLE_NAME[] = "contacts";
const wxChar CONTACT_TABLE_NAME[] = wxT("contacts");
#define wxODBC_BLOB_EXPERIMENT 1
@@ -51,7 +51,7 @@ const int CONTACT_NO_COLS = 13; // 0-12
const int CONTACT_NO_COLS = 12; // 0-11
#endif
const wxChar PARAM_FILENAME[] = "dbtest.cfg";
const wxChar PARAM_FILENAME[] = wxT("dbtest.cfg");
enum Language {langENGLISH, langFRENCH, langGERMAN, langSPANISH, langOTHER};
@@ -460,15 +460,15 @@ enum qryOp
// Query strings
wxChar * const langQRY_EQ = "column = column | value";
wxChar * const langQRY_LT = "column < column | value";
wxChar * const langQRY_GT = "column > column | value";
wxChar * const langQRY_LE = "column <= column | value";
wxChar * const langQRY_GE = "column >= column | value";
wxChar * const langQRY_BEGINS = "columns that BEGIN with the string entered";
wxChar * const langQRY_CONTAINS = "columns that CONTAIN the string entered";
wxChar * const langQRY_LIKE = "% matches 0 or more of any char; _ matches 1 char";
wxChar * const langQRY_BETWEEN = "column BETWEEN value AND value";
wxChar * const langQRY_EQ = wxT("column = column | value");
wxChar * const langQRY_LT = wxT("column < column | value");
wxChar * const langQRY_GT = wxT("column > column | value");
wxChar * const langQRY_LE = wxT("column <= column | value");
wxChar * const langQRY_GE = wxT("column >= column | value");
wxChar * const langQRY_BEGINS = wxT("columns that BEGIN with the string entered");
wxChar * const langQRY_CONTAINS = wxT("columns that CONTAIN the string entered");
wxChar * const langQRY_LIKE = wxT("% matches 0 or more of any char; _ matches 1 char");
wxChar * const langQRY_BETWEEN = wxT("column BETWEEN value AND value");
class CqueryDlg : public wxDialog
@@ -560,95 +560,95 @@ DECLARE_EVENT_TABLE()
#define QUERY_DIALOG_HINT_GROUP 323
#define QUERY_DIALOG_HINT_MSG 324
char * const langNO = "No";
char * const langYES = "Yes";
char * const langDBINF_DB_NAME = "Database Name = ";
char * const langDBINF_DB_VER = "Database Version = ";
char * const langDBINF_DRIVER_NAME = "Driver Name = ";
char * const langDBINF_DRIVER_ODBC_VER = "Driver ODBC Version = ";
char * const langDBINF_DRIVER_MGR_ODBC_VER = "Driver Manager ODBC Version = ";
char * const langDBINF_DRIVER_VER = "Driver Version = ";
char * const langDBINF_SERVER_NAME = "Server Name = ";
char * const langDBINF_FILENAME = "Filename = ";
char * const langDBINF_OUTER_JOINS = "Outer Joins = ";
char * const langDBINF_STORED_PROC = "Stored Procedures = ";
char * const langDBINF_MAX_HDBC = "Max # of Db connections = ";
char * const langDBINF_MAX_HSTMT = "Max # of cursors (per db connection) = ";
char * const langDBINF_UNLIMITED = "Unlimited or Unknown";
char * const langDBINF_API_LVL = "ODBC API conformance level = ";
char * const langDBINF_CLI_LVL = "Client (SAG) conformance level = ";
char * const langDBINF_SQL_LVL = "SQL conformance level = ";
char * const langDBINF_COMMIT_BEHAVIOR = "Commit Behavior = ";
char * const langDBINF_ROLLBACK_BEHAVIOR = "Rollback Behavior = ";
char * const langDBINF_SUPP_NOT_NULL = "Support NOT NULL clause = ";
char * const langDBINF_SUPP_IEF = "Support IEF = ";
char * const langDBINF_TXN_ISOLATION = "Transaction Isolation Level (default) = ";
char * const langDBINF_TXN_ISOLATION_CURR = "Transaction Isolation Level (current) = ";
char * const langDBINF_TXN_ISOLATION_OPTS = "Transaction Isolation Options Available = ";
char * const langDBINF_FETCH_DIRS = "Fetch Directions = ";
char * const langDBINF_LOCK_TYPES = "Lock Types (SQLSetPos) = ";
char * const langDBINF_POS_OPERS = "Position Operations (SQLSetPos) = ";
char * const langDBINF_POS_STMTS = "Position Statements = ";
char * const langDBINF_SCROLL_CONCURR = "Concurrency Options (scrollable cursors) = ";
char * const langDBINF_SCROLL_OPTS = "Scroll Options (scrollable cursors) = ";
char * const langDBINF_STATIC_SENS = "Static Sensitivity = ";
char * const langDBINF_TXN_CAPABLE = "Transaction Support = ";
char * const langDBINF_LOGIN_TIMEOUT = "Login Timeout = ";
char * const langDBINF_NONE = "None";
char * const langDBINF_LEVEL1 = "Level 1";
char * const langDBINF_LEVEL2 = "Level 2";
char * const langDBINF_NOT_COMPLIANT = "Not Compliant";
char * const langDBINF_COMPLIANT = "Compliant";
char * const langDBINF_MIN_GRAMMAR = "Minimum Grammer";
char * const langDBINF_CORE_GRAMMAR = "Core Grammer";
char * const langDBINF_EXT_GRAMMAR = "Extended Grammer";
char * const langDBINF_DELETE_CURSORS = "Delete cursors";
char * const langDBINF_CLOSE_CURSORS = "Close cursors";
char * const langDBINF_PRESERVE_CURSORS = "Preserve cursors";
char * const langDBINF_READ_UNCOMMITTED = "Read Uncommitted";
char * const langDBINF_READ_COMMITTED = "Read Committed";
char * const langDBINF_REPEATABLE_READ = "Repeatable Read";
char * const langDBINF_SERIALIZABLE = "Serializable";
char * const langDBINF_VERSIONING = "Versioning";
char * const langDBINF_NEXT = "Next";
char * const langDBINF_PREV = "Prev";
char * const langDBINF_FIRST = "First";
char * const langDBINF_LAST = "Last";
char * const langDBINF_ABSOLUTE = "Absolute";
char * const langDBINF_RELATIVE = "Relative";
char * const langDBINF_RESUME = "Resume";
char * const langDBINF_BOOKMARK = "Bookmark";
char * const langDBINF_NO_CHANGE = "No Change";
char * const langDBINF_EXCLUSIVE = "Exclusive";
char * const langDBINF_UNLOCK = "Unlock";
char * const langDBINF_POSITION = "Position";
char * const langDBINF_REFRESH = "Refresh";
char * const langDBINF_UPD = "Upd";
char * const langDBINF_DEL = "Del";
char * const langDBINF_ADD = "Add";
char * const langDBINF_POS_DEL = "Pos Delete";
char * const langDBINF_POS_UPD = "Pos Update";
char * const langDBINF_SELECT_FOR_UPD = "Select For Update";
char * const langDBINF_READ_ONLY = "Read Only";
char * const langDBINF_LOCK = "Lock";
char * const langDBINF_OPT_ROWVER = "Opt. Rowver";
char * const langDBINF_OPT_VALUES = "Opt. Values";
char * const langDBINF_FWD_ONLY = "Fwd Only";
char * const langDBINF_STATIC = "Static";
char * const langDBINF_KEYSET_DRIVEN = "Keyset Driven";
char * const langDBINF_DYNAMIC = "Dynamic";
char * const langDBINF_MIXED = "Mixed";
char * const langDBINF_ADDITIONS = "Additions";
char * const langDBINF_DELETIONS = "Deletions";
char * const langDBINF_UPDATES = "Updates";
char * const langDBINF_DML_ONLY = "DML Only";
char * const langDBINF_DDL_COMMIT = "DDL Commit";
char * const langDBINF_DDL_IGNORE = "DDL Ignore";
char * const langDBINF_DDL_AND_DML = "DDL and DML";
char * const langDBINF_ORACLE_BANNER = ">>> ORACLE STATISTICS AND TUNING INFORMATION <<<";
char * const langDBINF_DB_BLOCK_GETS = "DB block gets";
char * const langDBINF_CONSISTENT_GETS = "Consistent gets";
char * const langDBINF_PHYSICAL_READS = "Physical reads";
char * const langDBINF_CACHE_HIT_RATIO = "Cache hit ratio";
char * const langDBINF_TABLESPACE_IO = "TABLESPACE I/O LEVELS";
char * const langDBINF_PHYSICAL_WRITES = "Physical writes";
wxChar * const langNO = wxT("No");
wxChar * const langYES = wxT("Yes");
wxChar * const langDBINF_DB_NAME = wxT("Database Name = ");
wxChar * const langDBINF_DB_VER = wxT("Database Version = ");
wxChar * const langDBINF_DRIVER_NAME = wxT("Driver Name = ");
wxChar * const langDBINF_DRIVER_ODBC_VER = wxT("Driver ODBC Version = ");
wxChar * const langDBINF_DRIVER_MGR_ODBC_VER = wxT("Driver Manager ODBC Version = ");
wxChar * const langDBINF_DRIVER_VER = wxT("Driver Version = ");
wxChar * const langDBINF_SERVER_NAME = wxT("Server Name = ");
wxChar * const langDBINF_FILENAME = wxT("Filename = ");
wxChar * const langDBINF_OUTER_JOINS = wxT("Outer Joins = ");
wxChar * const langDBINF_STORED_PROC = wxT("Stored Procedures = ");
wxChar * const langDBINF_MAX_HDBC = wxT("Max # of Db connections = ");
wxChar * const langDBINF_MAX_HSTMT = wxT("Max # of cursors (per db connection) = ");
wxChar * const langDBINF_UNLIMITED = wxT("Unlimited or Unknown");
wxChar * const langDBINF_API_LVL = wxT("ODBC API conformance level = ");
wxChar * const langDBINF_CLI_LVL = wxT("Client (SAG) conformance level = ");
wxChar * const langDBINF_SQL_LVL = wxT("SQL conformance level = ");
wxChar * const langDBINF_COMMIT_BEHAVIOR = wxT("Commit Behavior = ");
wxChar * const langDBINF_ROLLBACK_BEHAVIOR = wxT("Rollback Behavior = ");
wxChar * const langDBINF_SUPP_NOT_NULL = wxT("Support NOT NULL clause = ");
wxChar * const langDBINF_SUPP_IEF = wxT("Support IEF = ");
wxChar * const langDBINF_TXN_ISOLATION = wxT("Transaction Isolation Level (default) = ");
wxChar * const langDBINF_TXN_ISOLATION_CURR = wxT("Transaction Isolation Level (current) = ");
wxChar * const langDBINF_TXN_ISOLATION_OPTS = wxT("Transaction Isolation Options Available = ");
wxChar * const langDBINF_FETCH_DIRS = wxT("Fetch Directions = ");
wxChar * const langDBINF_LOCK_TYPES = wxT("Lock Types (SQLSetPos) = ");
wxChar * const langDBINF_POS_OPERS = wxT("Position Operations (SQLSetPos) = ");
wxChar * const langDBINF_POS_STMTS = wxT("Position Statements = ");
wxChar * const langDBINF_SCROLL_CONCURR = wxT("Concurrency Options (scrollable cursors) = ");
wxChar * const langDBINF_SCROLL_OPTS = wxT("Scroll Options (scrollable cursors) = ");
wxChar * const langDBINF_STATIC_SENS = wxT("Static Sensitivity = ");
wxChar * const langDBINF_TXN_CAPABLE = wxT("Transaction Support = ");
wxChar * const langDBINF_LOGIN_TIMEOUT = wxT("Login Timeout = ");
wxChar * const langDBINF_NONE = wxT("None");
wxChar * const langDBINF_LEVEL1 = wxT("Level 1");
wxChar * const langDBINF_LEVEL2 = wxT("Level 2");
wxChar * const langDBINF_NOT_COMPLIANT = wxT("Not Compliant");
wxChar * const langDBINF_COMPLIANT = wxT("Compliant");
wxChar * const langDBINF_MIN_GRAMMAR = wxT("Minimum Grammer");
wxChar * const langDBINF_CORE_GRAMMAR = wxT("Core Grammer");
wxChar * const langDBINF_EXT_GRAMMAR = wxT("Extended Grammer");
wxChar * const langDBINF_DELETE_CURSORS = wxT("Delete cursors");
wxChar * const langDBINF_CLOSE_CURSORS = wxT("Close cursors");
wxChar * const langDBINF_PRESERVE_CURSORS = wxT("Preserve cursors");
wxChar * const langDBINF_READ_UNCOMMITTED = wxT("Read Uncommitted");
wxChar * const langDBINF_READ_COMMITTED = wxT("Read Committed");
wxChar * const langDBINF_REPEATABLE_READ = wxT("Repeatable Read");
wxChar * const langDBINF_SERIALIZABLE = wxT("Serializable");
wxChar * const langDBINF_VERSIONING = wxT("Versioning");
wxChar * const langDBINF_NEXT = wxT("Next");
wxChar * const langDBINF_PREV = wxT("Prev");
wxChar * const langDBINF_FIRST = wxT("First");
wxChar * const langDBINF_LAST = wxT("Last");
wxChar * const langDBINF_ABSOLUTE = wxT("Absolute");
wxChar * const langDBINF_RELATIVE = wxT("Relative");
wxChar * const langDBINF_RESUME = wxT("Resume");
wxChar * const langDBINF_BOOKMARK = wxT("Bookmark");
wxChar * const langDBINF_NO_CHANGE = wxT("No Change");
wxChar * const langDBINF_EXCLUSIVE = wxT("Exclusive");
wxChar * const langDBINF_UNLOCK = wxT("Unlock");
wxChar * const langDBINF_POSITION = wxT("Position");
wxChar * const langDBINF_REFRESH = wxT("Refresh");
wxChar * const langDBINF_UPD = wxT("Upd");
wxChar * const langDBINF_DEL = wxT("Del");
wxChar * const langDBINF_ADD = wxT("Add");
wxChar * const langDBINF_POS_DEL = wxT("Pos Delete");
wxChar * const langDBINF_POS_UPD = wxT("Pos Update");
wxChar * const langDBINF_SELECT_FOR_UPD = wxT("Select For Update");
wxChar * const langDBINF_READ_ONLY = wxT("Read Only");
wxChar * const langDBINF_LOCK = wxT("Lock");
wxChar * const langDBINF_OPT_ROWVER = wxT("Opt. Rowver");
wxChar * const langDBINF_OPT_VALUES = wxT("Opt. Values");
wxChar * const langDBINF_FWD_ONLY = wxT("Fwd Only");
wxChar * const langDBINF_STATIC = wxT("Static");
wxChar * const langDBINF_KEYSET_DRIVEN = wxT("Keyset Driven");
wxChar * const langDBINF_DYNAMIC = wxT("Dynamic");
wxChar * const langDBINF_MIXED = wxT("Mixed");
wxChar * const langDBINF_ADDITIONS = wxT("Additions");
wxChar * const langDBINF_DELETIONS = wxT("Deletions");
wxChar * const langDBINF_UPDATES = wxT("Updates");
wxChar * const langDBINF_DML_ONLY = wxT("DML Only");
wxChar * const langDBINF_DDL_COMMIT = wxT("DDL Commit");
wxChar * const langDBINF_DDL_IGNORE = wxT("DDL Ignore");
wxChar * const langDBINF_DDL_AND_DML = wxT("DDL and DML");
wxChar * const langDBINF_ORACLE_BANNER = wxT(">>> ORACLE STATISTICS AND TUNING INFORMATION <<<");
wxChar * const langDBINF_DB_BLOCK_GETS = wxT("DB block gets");
wxChar * const langDBINF_CONSISTENT_GETS = wxT("Consistent gets");
wxChar * const langDBINF_PHYSICAL_READS = wxT("Physical reads");
wxChar * const langDBINF_CACHE_HIT_RATIO = wxT("Cache hit ratio");
wxChar * const langDBINF_TABLESPACE_IO = wxT("TABLESPACE I/O LEVELS");
wxChar * const langDBINF_PHYSICAL_WRITES = wxT("Physical writes");

View File

@@ -89,7 +89,7 @@ extern wxApp *DatabaseDemoApp;
* NOTE: The value returned by this function is for temporary use only and
* should be copied for long term use
*/
const char *GetExtendedDBErrorMsg2(wxDb *pDb, char *ErrFile, int ErrLine)
const wxChar *GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *ErrFile, int ErrLine)
{
static wxString msg;
msg = wxT("");
@@ -307,7 +307,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
{
wxString tStr;
tStr.Printf(wxT("Unable to open the table '%s'."),tableName);
tStr += GetExtendedDBErrorMsg2(pDb,__FILE__,__LINE__);
tStr += GetExtendedDBErrorMsg2(pDb,__TFILE__,__LINE__);
wxMessageBox(tStr,wxT("ODBC Error..."));
Close();
return;
@@ -339,7 +339,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
return;
}
if (lookup2->GetNext())
maxColLen = col1Len = atoi(lookup2->lookupCol1);
maxColLen = col1Len = wxAtoi(lookup2->lookupCol1);
else
wxMessageBox(wxT("ODBC error during GetNext()"),wxT("ODBC Error..."));
}
@@ -430,7 +430,7 @@ void ClookUpDlg::OnButton( wxCommandEvent &event )
}
void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event)
void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
{
wxString widgetName = win.GetName();

View File

@@ -32,7 +32,7 @@ class Clookup : public wxDbTable
wxChar lookupCol[LOOKUP_COL_LEN+1];
Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir="");
Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir=wxT(""));
}; // Clookup
@@ -45,7 +45,7 @@ class Clookup2 : public wxDbTable
wxChar lookupCol1[LOOKUP_COL_LEN+1];
wxChar lookupCol2[LOOKUP_COL_LEN+1];
Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb, const wxString &defDir="");
Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb, const wxString &defDir=wxT(""));
}; // Clookup2