X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67a9999283b942053259fa418fe994eab8dd0b3b..c3fad64b429a8f88396ad3b1693b611206ee8ee5:/demos/dbbrowse/doc.cpp

diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp
index 2500fe611f..c8044d37a1 100644
--- a/demos/dbbrowse/doc.cpp
+++ b/demos/dbbrowse/doc.cpp
@@ -155,8 +155,8 @@ bool MainDoc::OnInitView()
 //----------------------------------------------------------------------------------------
 bool MainDoc::OnInitODBC()
 {
-    wxChar Dsn[SQL_MAX_DSN_LENGTH + 1];
-    wxChar DsDesc[255]; // BJO20002501 instead of 512
+    wxChar Dsn[SQL_MAX_DSN_LENGTH+1];
+    wxChar DsDesc[254+1]; // BJO20002501 instead of 512
     Temp0 = _T("");
     i_DSN = 0;       // Counter
     int i;
@@ -169,45 +169,40 @@ bool MainDoc::OnInitODBC()
     }
 
     //---------------------------------------------------------------------------------------
-    const char sep = 3; // separator character used in string between DSN ans DsDesc
-    wxStringList s_SortDSNList, s_SortDsDescList;
+    const wxChar sep = 3; // separator character used in string between DSN and DsDesc
+    wxSortedArrayString s_SortDSNList, s_SortDsDescList;
     // BJO-20000127
     // In order to have same sort result on both Dsn and DsDesc, create a 'keyed' string.
     // The key will be removed after sorting
     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 ?
         KeyString.Printf(_T("%s%c%s"),Dsn, sep, DsDesc);
         s_SortDSNList.Add(Dsn);
         s_SortDsDescList.Add(KeyString);
     }
-    s_SortDSNList.Sort();     //BJO
-    s_SortDsDescList.Sort();  //BJO
     
-    wxChar ** s_SortDSN = s_SortDSNList.ListToArray();        //BJO
-    wxChar ** s_SortDsDesc = s_SortDsDescList.ListToArray();  //BJO
     //---------------------------------------------------------------------------------------
     // Allocate n ODBC-DSN objects to hold the information
+    // Allocate n wxDatabase objects to hold the column information
     p_DSN = new DSN[i_DSN];  //BJO
+    db_Br = new BrowserDB[i_DSN];
     for (i=0;i<i_DSN;i++)
     {
-        KeyString = s_SortDsDesc[i];
+        KeyString = s_SortDsDescList[i];
         KeyString = KeyString.AfterFirst(sep);
-        wxStrcpy(s_SortDsDesc[i],KeyString.c_str());
-        (p_DSN+i)->Dsn = s_SortDSN[i];
-        (p_DSN+i)->Drv = s_SortDsDesc[i];
+
+        // ODBC-DSN object
+        (p_DSN+i)->Dsn = s_SortDSNList[i];
+        (p_DSN+i)->Drv = KeyString;
         (p_DSN+i)->Usr = _T("");
         (p_DSN+i)->Pas = _T("");
         Temp0.Printf(_T("%02d) Dsn(%s) DsDesc(%s)"),i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
         wxLogMessage(Temp0);
-    }
-    //---------------------------------------------------------------------------------------
-    // Allocate n wxDatabase objects to hold the column information
-    db_Br = new BrowserDB[i_DSN];
-    for (i=0;i<i_DSN;i++)
-    {
+
+        // wxDataBase object
         (db_Br+i)->p_LogWindow = p_LogWin;
         (db_Br+i)->ODBCSource  = (p_DSN+i)->Dsn;
         (db_Br+i)->UserName    = (p_DSN+i)->Usr;
@@ -218,8 +213,6 @@ bool MainDoc::OnInitODBC()
 
     DbConnectInf.FreeHenv();
 
-    delete [] s_SortDSN;
-    delete [] s_SortDsDesc;
     //---------------------------------------------------------------------------------------
     if (!i_DSN)
     {