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

wxChar* usage changed over to wxString in various places

Browse Source 
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
This commit is contained in:
George Tasker
2004-11-10 12:12:37 +00:00
parent 4e8f1c6dba
commit c3677ad324
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
samples/db/dbtest.h
View File

@@ -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