Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed a couple lines to intialize member variables correctly to match db/dbtable type changes to wxString from char *

Browse Source 
Spelling typos fixed
All hardcoded text strings and characters now inside wxT()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-02-01 20:17:15 +00:00
parent 548dffb11f
commit 94613352b5
4 changed files with 433 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

670
samples/db/dbtest.cpp
View File

File diff suppressed because it is too large Load Diff

56
samples/db/dbtest.h
View File

@@ -33,7 +33,7 @@ enum DialogModes {mView,mCreate,mEdit,mSearch};
#endif
// Name of the table to be created/opened
const char CONTACT_TABLE_NAME[] = "contacts";
const wxChar CONTACT_TABLE_NAME[] = "contacts";
// Nuber of columns in the above table
const int CONTACT_NO_COLS = 12; // 0-11
@@ -47,7 +47,7 @@ enum Language {langENGLISH, langFRENCH, langGERMAN, langSPANISH, langOTHER};
class CeditorDlg;
class CparameterDlg;
const char paramFilename[] = "dbtest.cfg";
const wxChar paramFilename[] = "dbtest.cfg";
/*
@@ -60,13 +60,13 @@ const char paramFilename[] = "dbtest.cfg";
class CstructContact : public wxObject
{
public:
char Name[50+1]; // Contact's name
char Addr1[50+1];
char Addr2[50+1];
char City[25+1];
char State[25+1];
char PostalCode[15+1];
char Country[20+1];
wxChar Name[50+1]; // Contact's name
wxChar Addr1[50+1];
wxChar Addr2[50+1];
wxChar City[25+1];
wxChar State[25+1];
wxChar PostalCode[15+1];
wxChar Country[20+1];
TIMESTAMP_STRUCT JoinDate; // Date on which this person joined the wxWindows project
Language NativeLanguage; // Enumerated type indicating person's native language
bool IsDeveloper; // Is this person a developer for wxWindows, or just a subscriber
@@ -93,7 +93,7 @@ class Ccontact : public wxDbTable, public CstructContact
void Initialize();
bool CreateIndexes(void);
bool FetchByName(char *name);
bool FetchByName(wxChar *name);
}; // Ccontact class definition
@@ -102,10 +102,10 @@ typedef struct Cparameters
{
// The length of these strings were arbitrarily picked, and are
// dependent on the OS and database engine you will be using.
char ODBCSource[100+1];
char UserName[25+1];
char Password[25+1];
char DirPath[MAX_PATH+1];
wxChar ODBCSource[100+1];
wxChar UserName[25+1];
wxChar Password[25+1];
wxChar DirPath[MAX_PATH+1];
} Cparameters;
@@ -186,7 +186,7 @@ class CeditorDlg : public wxPanel
bool Save();
bool GetNextRec();
bool GetPrevRec();
bool GetRec(char *whereStr);
bool GetRec(wxChar *whereStr);
DECLARE_EVENT_TABLE()
}; // CeditorDlg
@@ -299,15 +299,15 @@ enum qryOp
// Query strings
char * const langQRY_EQ = "column = column | value";
char * const langQRY_LT = "column < column | value";
char * const langQRY_GT = "column > column | value";
char * const langQRY_LE = "column <= column | value";
char * const langQRY_GE = "column >= column | value";
char * const langQRY_BEGINS = "columns that BEGIN with the string entered";
char * const langQRY_CONTAINS = "columns that CONTAIN the string entered";
char * const langQRY_LIKE = "% matches 0 or more of any char; _ matches 1 char";
char * const langQRY_BETWEEN = "column BETWEEN value AND value";
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";
class CqueryDlg : public wxDialog
@@ -315,8 +315,8 @@ class CqueryDlg : public wxDialog
private:
wxDbColInf *colInf; // Column inf. returned by db->GetColumns()
wxDbTable *dbTable;
char *masterTableName;
char *pWhere; // A pointer to the storage for the resulting where clause
wxChar *masterTableName;
wxChar *pWhere; // A pointer to the storage for the resulting where clause
wxDb *pDB;
public:
@@ -351,7 +351,7 @@ class CqueryDlg : public wxDialog
wxTextCtrl *pFocusTxt;
CqueryDlg(wxWindow *parent, wxDb *pDb, char *tblName[], char *pWhereArg);
CqueryDlg(wxWindow *parent, wxDb *pDb, wxChar *tblName[], wxChar *pWhereArg);
~CqueryDlg();
void OnButton( wxCommandEvent &event );
@@ -359,7 +359,7 @@ class CqueryDlg : public wxDialog
void OnCloseWindow(wxCloseEvent& event);
void OnActivate(bool) {}; // necessary for hot keys
void AppendToWhere(char *s);
void AppendToWhere(wxChar *s);
void ProcessAddBtn();
void ProcessCountBtn();
bool ValidateWhereClause();

109
samples/db/listdb.cpp
View File

@@ -22,7 +22,7 @@
single selection listbox.
The string selected from the list box is stored in the Global variable
"ListDB_Seclection", and will remain set until another interation of this
"ListDB_Selection", and will remain set until another interation of this
routine is called.
For each object (database) type that is to be used, an overridden
@@ -70,11 +70,11 @@ extern wxDb *READONLY_DB;
// Used for passing the selected listbox selection back to the calling
// routine. This variable must be declared as 'extern' in the calling
// source module
char ListDB_Selection[LOOKUP_COL_LEN+1];
wxChar ListDB_Selection[LOOKUP_COL_LEN+1];
// If the listbox contains two columns of data, the second column is
// returned in this variable.
char ListDB_Selection2[LOOKUP_COL_LEN+1];
wxChar ListDB_Selection2[LOOKUP_COL_LEN+1];
// Constants
const int LISTDB_NO_SPACES_BETWEEN_COLS = 3;
@@ -93,25 +93,25 @@ const int LISTDB_NO_SPACES_BETWEEN_COLS = 3;
* NOTE: The value returned by this function is for temporary use only and
* should be copied for long term use
*/
const char *GetExtendedDBErrorMsg2(char *ErrFile, int ErrLine)
const wxChar *GetExtendedDBErrorMsg2(wxChar *ErrFile, int ErrLine)
{
static wxString msg;
msg = "";
msg.Empty();
wxString tStr;
if (ErrFile || ErrLine)
{
msg += "File: ";
msg += wxT("File: ");
msg += ErrFile;
msg += " Line: ";
tStr.Printf("%d",ErrLine);
msg += tStr.c_str();
msg += "\n";
msg += wxT(" Line: ");
tStr.Printf(wxT("%d"),ErrLine);
msg += tStr;
msg += wxT("\n");
}
msg.Append ("\nODBC errors:\n");
msg += "\n";
msg.Append (wxT("\nODBC errors:\n"));
msg += wxT("\n");
/* Scan through each database connection displaying
* any ODBC errors that have occured. */
@@ -127,23 +127,24 @@ const char *GetExtendedDBErrorMsg2(char *ErrFile, int ErrLine)
if (pDbList->PtrDb->errorList[i])
{
msg.Append(pDbList->PtrDb->errorList[i]);
if (wxStrcmp(pDbList->PtrDb->errorList[i],"") != 0)
msg.Append("\n");
if (wxStrcmp(pDbList->PtrDb->errorList[i],wxT("")) != 0)
msg.Append(wxT("\n"));
// Clear the errmsg buffer so the next error will not
// end up showing the previous error that have occurred
wxStrcpy(pDbList->PtrDb->errorList[i],"");
wxStrcpy(pDbList->PtrDb->errorList[i],wxT(""));
}
}
}
msg += "\n";
msg += wxT("\n");
return /*(char*) (const char*) msg*/msg.c_str();
return /*(wxChar*) (const wxChar*) msg*/msg.c_str();
} // GetExtendedDBErrorMsg
// Clookup constructor
Clookup::Clookup(char *tblName, char *colName) : wxDbTable(READONLY_DB, tblName, 1, NULL, !wxDB_QUERY_ONLY, DbConnectInf.defaultDir)
Clookup::Clookup(wxChar *tblName, wxChar *colName) :
wxDbTable(READONLY_DB, tblName, 1, wxT(""), !wxDB_QUERY_ONLY, DbConnectInf.defaultDir)
{
SetColDefs (0, colName, DB_DATA_TYPE_VARCHAR, lookupCol, SQL_C_CHAR, LOOKUP_COL_LEN+1, FALSE, FALSE);
@@ -152,7 +153,7 @@ Clookup::Clookup(char *tblName, char *colName) : wxDbTable(READONLY_DB, tblName,
// Clookup2 constructor
Clookup2::Clookup2(char *tblName, char *colName1, char *colName2, wxDb *pDb)
Clookup2::Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb)
: wxDbTable(pDb, tblName, (1 + (wxStrlen(colName2) > 0)), NULL, !wxDB_QUERY_ONLY, DbConnectInf.defaultDir)
{
int i = 0;
@@ -173,28 +174,28 @@ BEGIN_EVENT_TABLE(ClookUpDlg, wxDialog)
END_EVENT_TABLE()
// This is a generic lookup constructor that will work with any table and any column
ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, char *colName,
char *where, char *orderBy) : wxDialog (parent, LOOKUP_DIALOG, "Select...", wxPoint(-1, -1), wxSize(400, 290))
ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, wxChar *colName,
wxChar *where, wxChar *orderBy) : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxPoint(-1, -1), wxSize(400, 290))
{
wxBeginBusyCursor();
wxStrcpy(ListDB_Selection,"");
wxStrcpy(ListDB_Selection,wxT(""));
widgetPtrsSet = FALSE;
lookup = 0;
lookup2 = 0;
noDisplayCols = 1;
col1Len = 0;
pLookUpSelectList = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint( 5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, "LookUpSelectList");
pLookUpOkBtn = new wxButton(this, LOOKUP_DIALOG_OK, "&Ok", wxPoint(113, 222), wxSize( 70, 35), 0, wxDefaultValidator, "LookUpOkBtn");
pLookUpCancelBtn = new wxButton(this, LOOKUP_DIALOG_CANCEL, "C&ancel", wxPoint(212, 222), wxSize( 70, 35), 0, wxDefaultValidator, "LookUpCancelBtn");
pLookUpSelectList = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint( 5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("LookUpSelectList"));
pLookUpOkBtn = new wxButton(this, LOOKUP_DIALOG_OK, wxT("&Ok"), wxPoint(113, 222), wxSize( 70, 35), 0, wxDefaultValidator, wxT("LookUpOkBtn"));
pLookUpCancelBtn = new wxButton(this, LOOKUP_DIALOG_CANCEL, wxT("C&ancel"), wxPoint(212, 222), wxSize( 70, 35), 0, wxDefaultValidator, wxT("LookUpCancelBtn"));
widgetPtrsSet = TRUE;
// Query the lookup table and display the result set
if (!(lookup = new Clookup(tableName, colName)))
{
wxMessageBox("Error allocating memory for 'Clookup'object.","Error...");
wxMessageBox(wxT("Error allocating memory for 'Clookup'object."),wxT("Error..."));
Close();
return;
}
@@ -202,8 +203,8 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, cha
if (!lookup->Open())
{
wxString tStr;
tStr.Printf("Unable to open the table '%s'.",tableName);
wxMessageBox(tStr,"ODBC Error...");
tStr.Printf(wxT("Unable to open the table '%s'."),tableName);
wxMessageBox(tStr,wxT("ODBC Error..."));
Close();
return;
}
@@ -212,7 +213,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, cha
lookup->SetWhereClause(where);
if (!lookup->Query())
{
wxMessageBox("ODBC error during Query()","ODBC Error...");
wxMessageBox(wxT("ODBC error during Query()"),wxT("ODBC Error..."));
Close();
return;
}
@@ -266,14 +267,14 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, cha
// records are being saved, but not committed to the db, yet should be included
// in the lookup window.
//
ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
char *dispCol1, char *dispCol2, char *where, char *orderBy, bool distinctValues,
char *selectStmt, int maxLenCol1, wxDb *pDb, bool allowOk) : wxDialog (parent, LOOKUP_DIALOG, "Select...", wxPoint(-1, -1), wxSize(400, 290))
ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
wxChar *dispCol1, wxChar *dispCol2, wxChar *where, wxChar *orderBy, bool distinctValues,
wxChar *selectStmt, int maxLenCol1, wxDb *pDb, bool allowOk) : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxPoint(-1, -1), wxSize(400, 290))
{
wxBeginBusyCursor();
wxStrcpy(ListDB_Selection,"");
wxStrcpy(ListDB_Selection2,"");
wxStrcpy(ListDB_Selection,wxT(""));
wxStrcpy(ListDB_Selection2,wxT(""));
widgetPtrsSet = FALSE;
lookup = 0;
lookup2 = 0;
@@ -284,19 +285,19 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
// this is done with fixed font so that the second column (if any) will be left
// justified in the second column
pLookUpSelectList = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint(5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, "LookUpSelectList");
pLookUpSelectList = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint(5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("LookUpSelectList"));
pLookUpSelectList->SetFont(fixedFont);
pLookUpOkBtn = new wxButton(this, LOOKUP_DIALOG_OK, "&Ok", wxPoint(113, 222), wxSize(70, 35), 0, wxDefaultValidator, "LookUpOkBtn");
pLookUpCancelBtn = new wxButton(this, LOOKUP_DIALOG_CANCEL, "C&ancel", wxPoint(212, 222), wxSize(70, 35), 0, wxDefaultValidator, "LookUpCancelBtn");
pLookUpOkBtn = new wxButton(this, LOOKUP_DIALOG_OK, wxT("&Ok"), wxPoint(113, 222), wxSize(70, 35), 0, wxDefaultValidator, wxT("LookUpOkBtn"));
pLookUpCancelBtn = new wxButton(this, LOOKUP_DIALOG_CANCEL, wxT("C&ancel"), wxPoint(212, 222), wxSize(70, 35), 0, wxDefaultValidator, wxT("LookUpCancelBtn"));
widgetPtrsSet = TRUE;
// Query the lookup table and display the result set
if (!(lookup2 = new Clookup2(tableName, dispCol1, dispCol2, pDb)))
{
wxMessageBox("Error allocating memory for 'Clookup2'object.","Error...");
wxMessageBox(wxT("Error allocating memory for 'Clookup2' object."),wxT("Error..."));
Close();
return;
}
@@ -304,9 +305,9 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
if (!lookup2->Open())
{
wxString tStr;
tStr.Printf("Unable to open the table '%s'.",tableName);
tStr.Printf(wxT("Unable to open the table '%s'."),tableName);
tStr += GetExtendedDBErrorMsg2(__FILE__,__LINE__);
wxMessageBox(tStr,"ODBC Error...");
wxMessageBox(tStr,wxT("ODBC Error..."));
Close();
return;
}
@@ -320,26 +321,26 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
maxColLen = LOOKUP_COL_LEN;
if (wxStrlen(dispCol2))
{
wxString q = "SELECT MAX({fn LENGTH(";
wxString q = wxT("SELECT MAX({fn LENGTH(");
q += dispCol1;
q += ")}), NULL";
q += " FROM ";
q += wxT(")}), NULL");
q += wxT(" FROM ");
q += tableName;
if (wxStrlen(where))
{
q += " WHERE ";
q += wxT(" WHERE ");
q += where;
}
if (!lookup2->QueryBySqlStmt((char*) (const char*) q))
if (!lookup2->QueryBySqlStmt(q))
{
wxMessageBox("ODBC error during QueryBySqlStmt()","ODBC Error...");
wxMessageBox(wxT("ODBC error during QueryBySqlStmt()"),wxT("ODBC Error..."));
Close();
return;
}
if (lookup2->GetNext())
maxColLen = col1Len = atoi(lookup2->lookupCol1);
else
wxMessageBox("ODBC error during GetNext()","ODBC Error...");
wxMessageBox(wxT("ODBC error during GetNext()"),wxT("ODBC Error..."));
}
}
@@ -348,7 +349,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
{
if (!lookup2->QueryBySqlStmt(selectStmt))
{
wxMessageBox("ODBC error during QueryBySqlStmt()","ODBC Error...");
wxMessageBox(wxT("ODBC error during QueryBySqlStmt()"),wxT("ODBC Error..."));
Close();
return;
}
@@ -359,7 +360,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
lookup2->SetWhereClause(where);
if (!lookup2->Query(FALSE, distinctValues))
{
wxMessageBox("ODBC error during Query()","ODBC Error...");
wxMessageBox(wxT("ODBC error during Query()"),wxT("ODBC Error..."));
Close();
return;
}
@@ -372,7 +373,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
s = lookup2->lookupCol1;
if (wxStrlen(dispCol2)) // Append the optional column 2
{
s.Append(' ', (maxColLen + LISTDB_NO_SPACES_BETWEEN_COLS - wxStrlen(lookup2->lookupCol1)));
s.Append(wxT(' '), (maxColLen + LISTDB_NO_SPACES_BETWEEN_COLS - wxStrlen(lookup2->lookupCol1)));
s.Append(lookup2->lookupCol2);
}
pLookUpSelectList->Append(s);
@@ -457,8 +458,8 @@ void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event)
}
else
{
wxStrcpy(ListDB_Selection,"");
wxStrcpy(ListDB_Selection2,"");
wxStrcpy(ListDB_Selection,wxT(""));
wxStrcpy(ListDB_Selection2,wxT(""));
}
Close();
} // OK Button
@@ -466,8 +467,8 @@ void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event)
// Cancel Button
if (widgetName == pLookUpCancelBtn->GetName())
{
wxStrcpy (ListDB_Selection,"");
wxStrcpy (ListDB_Selection2,"");
wxStrcpy (ListDB_Selection,wxT(""));
wxStrcpy (ListDB_Selection2,wxT(""));
Close();
} // Cancel Button
}

42
samples/db/listdb.h
View File

@@ -33,9 +33,9 @@ class Clookup : public wxDbTable
{
public:
char lookupCol[LOOKUP_COL_LEN+1];
wxChar lookupCol[LOOKUP_COL_LEN+1];
Clookup(char *tblName, char *colName);
Clookup(wxChar *tblName, wxChar *colName);
}; // Clookup
@@ -44,10 +44,10 @@ class Clookup2 : public wxDbTable
{
public:
char lookupCol1[LOOKUP_COL_LEN+1];
char lookupCol2[LOOKUP_COL_LEN+1];
wxChar lookupCol1[LOOKUP_COL_LEN+1];
wxChar lookupCol2[LOOKUP_COL_LEN+1];
Clookup2(char *tblName, char *colName1, char *colName2, wxDb *pDb);
Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb);
}; // Clookup2
@@ -69,11 +69,11 @@ class ClookUpDlg : public wxDialog
// This is a generic lookup constructor that will work with any table and any column
ClookUpDlg(wxWindow *parent,
char *windowTitle,
char *tableName,
char *colName,
char *where,
char *orderBy);
wxChar *windowTitle,
wxChar *tableName,
wxChar *colName,
wxChar *where,
wxChar *orderBy);
//
// This is a generic lookup constructor that will work with any table and any column.
@@ -100,17 +100,17 @@ class ClookUpDlg : public wxDialog
// in the lookup window.
//
ClookUpDlg(wxWindow *parent,
char *windowTitle,
char *tableName,
char *dispCol1, // Must have at least 1 display column
char *dispCol2, // Optional
char *where,
char *orderBy,
bool distinctValues, // e.g. SELECT DISTINCT ...
char *selectStmt = 0, // If you wish to query by SQLstmt (complicated lookups)
int maxLenCol1 = 0, // Mandatory if querying by SQLstmt
wxDb *pDb = READONLY_DB, // Database connection pointer
bool allowOk = TRUE); // is the OK button enabled
wxChar *windowTitle,
wxChar *tableName,
wxChar *dispCol1, // Must have at least 1 display column
wxChar *dispCol2, // Optional
wxChar *where,
wxChar *orderBy,
bool distinctValues, // e.g. SELECT DISTINCT ...
wxChar *selectStmt = 0, // If you wish to query by SQLstmt (complicated lookups)
int maxLenCol1 = 0, // Mandatory if querying by SQLstmt
wxDb *pDb = READONLY_DB, // Database connection pointer
bool allowOk = TRUE); // is the OK button enabled
void OnButton( wxCommandEvent &event );
void OnCommand(wxWindow& win, wxCommandEvent& event);