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

Unicode support added

Browse Source 
SQL_C_WXCHAR now used throughout the code


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2004-11-04 21:36:32 +00:00
parent da1e87c4c9
commit d73ae65656
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/dbbrowse/browsedb.cpp
View File

@@ -470,7 +470,7 @@ void BrowserDB::OnFillSqlTyp()
i_SqlTyp[1] = SQL_C_BINARY; s_SqlTyp[1] = _T("SQL_C_BINARY"); i_SqlTyp[1] = SQL_C_BINARY; s_SqlTyp[1] = _T("SQL_C_BINARY");
i_SqlTyp[2] = SQL_C_BIT; s_SqlTyp[2] = _T("SQL_C_BIT"); i_SqlTyp[2] = SQL_C_BIT; s_SqlTyp[2] = _T("SQL_C_BIT");
i_SqlTyp[3] = SQL_C_BOOKMARK; s_SqlTyp[3] = _T("SQL_C_BOOKMARK"); i_SqlTyp[3] = SQL_C_BOOKMARK; s_SqlTyp[3] = _T("SQL_C_BOOKMARK");
i_SqlTyp[4] = SQL_C_CHAR; s_SqlTyp[4] = _T("SQL_C_CHAR"); i_SqlTyp[4] = SQL_C_WXCHAR; s_SqlTyp[4] = _T("SQL_C_WXCHAR");
i_SqlTyp[5] = SQL_C_DATE; s_SqlTyp[5] = _T("SQL_C_DATE"); i_SqlTyp[5] = SQL_C_DATE; s_SqlTyp[5] = _T("SQL_C_DATE");
i_SqlTyp[6] = SQL_C_DEFAULT; s_SqlTyp[6] = _T("SQL_C_DEFAULT"); i_SqlTyp[6] = SQL_C_DEFAULT; s_SqlTyp[6] = _T("SQL_C_DEFAULT");
i_SqlTyp[7] = SQL_C_DOUBLE; s_SqlTyp[7] = _T("SQL_C_DOUBLE"); i_SqlTyp[7] = SQL_C_DOUBLE; s_SqlTyp[7] = _T("SQL_C_DOUBLE");

6
demos/dbbrowse/doc.cpp
View File

@@ -156,7 +156,7 @@ bool MainDoc::OnInitView()
bool MainDoc::OnInitODBC() bool MainDoc::OnInitODBC()
{ {
wxChar Dsn[SQL_MAX_DSN_LENGTH+1]; wxChar Dsn[SQL_MAX_DSN_LENGTH+1];
wxChar DsDesc[255]; // BJO20002501 instead of 512 wxChar DsDesc[254+1]; // BJO20002501 instead of 512
Temp0 = _T(""); Temp0 = _T("");
i_DSN = 0; // Counter i_DSN = 0; // Counter
int i; int i;
@@ -169,14 +169,14 @@ bool MainDoc::OnInitODBC()
} }
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------
const char sep = 3; // separator character used in string between DSN ans DsDesc const wxChar sep = 3; // separator character used in string between DSN and DsDesc
wxSortedArrayString s_SortDSNList, s_SortDsDescList; wxSortedArrayString s_SortDSNList, s_SortDsDescList;
// BJO-20000127 // BJO-20000127
// In order to have same sort result on both Dsn and DsDesc, create a 'keyed' string. // In order to have same sort result on both Dsn and DsDesc, create a 'keyed' string.
// The key will be removed after sorting // The key will be removed after sorting
wxString KeyString; wxString KeyString;
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------
while(wxDbGetDataSource(DbConnectInf.GetHenv(), Dsn, sizeof(Dsn), DsDesc, sizeof(DsDesc))) while (wxDbGetDataSource(DbConnectInf.GetHenv(), Dsn, SQL_MAX_DSN_LENGTH, DsDesc, 254))
{ {
i_DSN++; // How many Dsn have we ? i_DSN++; // How many Dsn have we ?
KeyString.Printf(_T("%s%c%s"),Dsn, sep, DsDesc); KeyString.Printf(_T("%s%c%s"),Dsn, sep, DsDesc);