From c3677ad324e00cb69cf56765a43b54c63a5e4c70 Mon Sep 17 00:00:00 2001 From: George Tasker Date: Wed, 10 Nov 2004 12:12:37 +0000 Subject: [PATCH] wxChar* usage changed over to wxString in various places Warning fixes when compiling in compatibility 2_4 mode to force use of the desired wxDbTable constructor git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/db/dbtest.cpp | 28 ++++++++++++++-------------- samples/db/dbtest.h | 22 +++++++++++----------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp index d4c894c2d8..38376a6e9b 100644 --- a/samples/db/dbtest.cpp +++ b/samples/db/dbtest.cpp @@ -1015,7 +1015,7 @@ void DatabaseDemoFrame::BuildParameterDialog(wxWindow *parent) * will be committed or rolled back when any of the objects has this function call made. */ Ccontact::Ccontact (wxDb *pwxDb) : wxDbTable(pwxDb ? pwxDb : wxDbGetConnection(wxGetApp().DbConnectInf), - CONTACT_TABLE_NAME, CONTACT_NO_COLS, wxEmptyString, + CONTACT_TABLE_NAME, CONTACT_NO_COLS, (const wxString &)wxEmptyString, !wxDB_QUERY_ONLY, wxGetApp().DbConnectInf->GetDefaultDir()) { // This is used to represent whether the database connection should be released @@ -1359,7 +1359,7 @@ void CeditorDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event)) // Display the query dialog box wxChar qryWhere[DB_MAX_WHERE_CLAUSE_LEN+1]; wxStrcpy(qryWhere, (const wxChar*) wxGetApp().Contact->qryWhereStr); - wxChar *tblName[] = {(wxChar *)CONTACT_TABLE_NAME, 0}; + wxChar *tblName[] = {(wxChar *)CONTACT_TABLE_NAME.c_str(), 0}; new CqueryDlg(GetParent(), wxGetApp().Contact->GetDb(), tblName, qryWhere); // Query the first record in the new record set and @@ -1443,16 +1443,16 @@ void CeditorDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event)) if (widgetName == pNameListBtn->GetName()) { - new ClookUpDlg(/* wxWindow *parent */ this, - /* wxChar *windowTitle */ wxT("Select contact name"), - /* wxChar *tableName */ (wxChar *) CONTACT_TABLE_NAME, - /* wxChar *dispCol1 */ wxT("NAME"), - /* wxChar *dispCol2 */ wxT("JOINDATE"), - /* wxChar *where */ wxT(""), - /* wxChar *orderBy */ wxT("NAME"), - /* wxDb *pDb */ wxGetApp().READONLY_DB, - /* const wxString &defDir */ wxGetApp().DbConnectInf->GetDefaultDir(), - /* bool distinctValues */ true); + new ClookUpDlg(/* wxWindow *parent */ this, + /* const wxString &windowTitle */ wxT("Select contact name"), + /* const wxString &tableName */ CONTACT_TABLE_NAME, + /* const wxString &dispCol1 */ wxT("NAME"), + /* const wxString &dispCol2 */ wxT("JOINDATE"), + /* const wxString &where */ wxT(""), + /* const wxString &orderBy */ wxT("NAME"), + /* wxDb *pDb */ wxGetApp().READONLY_DB, + /* const wxString &defDir */ wxGetApp().DbConnectInf->GetDefaultDir(), + /* bool distinctValues*/ true); if (ListDB_Selection && wxStrlen(ListDB_Selection)) { @@ -1518,7 +1518,7 @@ bool CeditorDlg::Initialize() // Check if the table exists or not. If it doesn't, ask the user if they want to // create the table. Continue trying to create the table until it exists, or user aborts - while (!wxGetApp().Contact->GetDb()->TableExists((wxChar *)CONTACT_TABLE_NAME, + while (!wxGetApp().Contact->GetDb()->TableExists(CONTACT_TABLE_NAME, wxGetApp().DbConnectInf->GetUserID(), wxGetApp().DbConnectInf->GetDefaultDir())) { @@ -2818,7 +2818,7 @@ void CqueryDlg::ProcessCountBtn() if (!dbTable) // wxDbTable object needs to be created and opened { - dbTable = new wxDbTable(pDB, masterTableName, 0, wxEmptyString, + dbTable = new wxDbTable(pDB, masterTableName, 0, (const wxString &)wxEmptyString, !wxDB_QUERY_ONLY, wxGetApp().DbConnectInf->GetDefaultDir()); if (!dbTable) diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h index 07343e7570..09bfe28a1b 100644 --- a/samples/db/dbtest.h +++ b/samples/db/dbtest.h @@ -40,7 +40,7 @@ enum DialogModes {mView,mCreate,mEdit,mSearch}; #endif // Name of the table to be created/opened -const wxChar CONTACT_TABLE_NAME[] = wxT("contacts"); +const wxString CONTACT_TABLE_NAME = wxT("contacts"); #define wxODBC_BLOB_SUPPORT @@ -53,7 +53,7 @@ const wxChar CONTACT_TABLE_NAME[] = wxT("contacts"); const int CONTACT_NO_COLS = 12; // 0-11 #endif -const wxChar PARAM_FILENAME[] = wxT("dbtest.cfg"); +const wxString PARAM_FILENAME = wxT("dbtest.cfg"); enum Language {langENGLISH, langFRENCH, langGERMAN, langSPANISH, langOTHER}; @@ -479,15 +479,15 @@ enum qryOp // Query strings -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"); +wxString const & langQRY_EQ = wxT("column = column | value"); +const wxString & langQRY_LT = wxT("column < column | value"); +const wxString & langQRY_GT = wxT("column > column | value"); +const wxString & langQRY_LE = wxT("column <= column | value"); +const wxString & langQRY_GE = wxT("column >= column | value"); +const wxString & langQRY_BEGINS = wxT("columns that BEGIN with the string entered"); +const wxString & langQRY_CONTAINS = wxT("columns that CONTAIN the string entered"); +const wxString & langQRY_LIKE = wxT("% matches 0 or more of any char; _ matches 1 char"); +const wxString & langQRY_BETWEEN = wxT("column BETWEEN value AND value"); class CqueryDlg : public wxDialog -- 2.45.2