wxMediaCtrl patch from Ryan:

[wxWidgets.git] / demos / dbbrowse / browsedb.cpp

diff --git a/demos/dbbrowse/browsedb.cpp b/demos/dbbrowse/browsedb.cpp
index c228de80ac5f099c7254d036d0a295a796fdf9c6..d4f2ffbc0e5223fab0ad92c90c3f0bf676555c96 100644 (file)
--- a/demos/dbbrowse/browsedb.cpp
+++ b/demos/dbbrowse/browsedb.cpp
@@ -1,12 +1,12 @@
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-// Name:               BrowserDB.h,cpp
-// Purpose:    a wxDB class
-// Author:             Mark Johnson
+// Name:        BrowserDB.h,cpp
+// Purpose:     a wxDB class
+// Author:      Mark Johnson

 // Modified by:
 // Modified by:

-// Created:    19991127.mj10777
-// Copyright:  (c) Mark Johnson
-// Licence:    wxWindows license
-// RCS-ID:             $Id$
+// Created:     19991127.mj10777
+// Copyright:   (c) Mark Johnson
+// Licence:     wxWindows license
+// RCS-ID:      $Id$

 //----------------------------------------------------------------------------------------
 //-- 1)
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
 //-- 1)
 //----------------------------------------------------------------------------------------


@@ -38,7 +38,7 @@ wxDbConnectInf DbConnectInf;
 #endif
 
 //----------------------------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------------------------

-extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList;       /* from db.cpp, used in getting back error results from db connections */
+extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */

 
 //----------------------------------------------------------------------------------------
 wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)
 
 //----------------------------------------------------------------------------------------
 wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)


@@ -57,7 +57,7 @@ wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)
     msg.Append (_T("\nODBC errors:\n"));
     // msg += _T("\n");
     /* Scan through each database connection displaying
     msg.Append (_T("\nODBC errors:\n"));
     // msg += _T("\n");
     /* Scan through each database connection displaying

-    * any ODBC errors that have occured. */
+    * any ODBC errors that have occurred. */

     wxDbList *pDbList;
     for (pDbList = PtrBegDbList; pDbList; pDbList = pDbList->PtrNext)
     {
     wxDbList *pDbList;
     for (pDbList = PtrBegDbList; pDbList; pDbList = pDbList->PtrNext)
     {


@@ -70,7 +70,7 @@ wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)
             if (pDbList->PtrDb->errorList[i])
             {
                 msg.Append(pDbList->PtrDb->errorList[i]);
             if (pDbList->PtrDb->errorList[i])
             {
                 msg.Append(pDbList->PtrDb->errorList[i]);

-                if (wxStrcmp(pDbList->PtrDb->errorList[i],_T("")) != 0)
+                if (wxStrcmp(pDbList->PtrDb->errorList[i],wxEmptyString) != 0)

                     msg.Append(_T("\n"));
             }
         }
                     msg.Append(_T("\n"));
             }
         }


@@ -83,9 +83,9 @@ wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)
 BrowserDB::BrowserDB()
 {
     PointerToNULL(0);
 BrowserDB::BrowserDB()
 {
     PointerToNULL(0);

-    ODBCSource = _T("");  // ODBC data source name (created with ODBC Administrator under Win95/NT)
-    UserName   = _T("");  // database username - must already exist in the data source
-    Password   = _T("");  // password database username
+    ODBCSource = wxEmptyString;  // ODBC data source name (created with ODBC Administrator under Win95/NT)
+    UserName   = wxEmptyString;  // database username - must already exist in the data source
+    Password   = wxEmptyString;  // password database username

     OnFillSqlTyp();
     OnFilldbTyp();
 }  // BrowserDB Constructor
     OnFillSqlTyp();
     OnFilldbTyp();
 }  // BrowserDB Constructor


@@ -102,9 +102,9 @@ bool BrowserDB::Initialize(int Quiet)
     if (!OnStartDB(Quiet))
     {
         wxLogMessage(_("\n\n-E-> BrowserDB::OnStartDB(%s) : Failed ! "),ODBCSource.c_str());
     if (!OnStartDB(Quiet))
     {
         wxLogMessage(_("\n\n-E-> BrowserDB::OnStartDB(%s) : Failed ! "),ODBCSource.c_str());

-        return FALSE;
+        return false;

     }
     }

-    return TRUE;
+    return true;

 }  // BrowserDB:Initialize
 
 //----------------------------------------------------------------------------------------
 }  // BrowserDB:Initialize
 
 //----------------------------------------------------------------------------------------


@@ -117,7 +117,7 @@ bool BrowserDB::OnStartDB(int Quiet)
     {
         if (!Quiet)
             wxLogMessage(_("\n-I-> BrowserDB::OnStartDB() : DB is already open."));
     {
         if (!Quiet)
             wxLogMessage(_("\n-I-> BrowserDB::OnStartDB() : DB is already open."));

-        return TRUE;
+        return true;

     }
 
     DbConnectInf.AllocHenv();
     }
 
     DbConnectInf.AllocHenv();


@@ -126,43 +126,43 @@ bool BrowserDB::OnStartDB(int Quiet)
     // Connect to datasource
     //---------------------------------------------------------------------------------------
     DlgUser *p_Dlg;
     // Connect to datasource
     //---------------------------------------------------------------------------------------
     DlgUser *p_Dlg;

-    p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,_T(""));
-    p_Dlg->s_DSN         = ODBCSource;
-    p_Dlg->s_User        = UserName;
+    p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,wxEmptyString);
+    p_Dlg->s_DSN      = ODBCSource;
+    p_Dlg->s_User     = UserName;

     p_Dlg->s_Password = Password;
     p_Dlg->OnInit();
     p_Dlg->Fit();
     p_Dlg->s_Password = Password;
     p_Dlg->OnInit();
     p_Dlg->Fit();

-    
-    bool OK = FALSE;
+
+    bool OK = false;

     if (p_Dlg->ShowModal() == wxID_OK)
     {
         (pDoc->p_DSN+i_Which)->Usr = p_Dlg->s_User;
         (pDoc->p_DSN+i_Which)->Pas = p_Dlg->s_Password;
         UserName  = p_Dlg->s_User;
         Password  = p_Dlg->s_Password;
     if (p_Dlg->ShowModal() == wxID_OK)
     {
         (pDoc->p_DSN+i_Which)->Usr = p_Dlg->s_User;
         (pDoc->p_DSN+i_Which)->Pas = p_Dlg->s_Password;
         UserName  = p_Dlg->s_User;
         Password  = p_Dlg->s_Password;

-        OK = TRUE;
+        OK = true;

     }
     delete p_Dlg;
     if (OK)
     {
         //--------------------------------------------------------------------------------------
     }
     delete p_Dlg;
     if (OK)
     {
         //--------------------------------------------------------------------------------------

-        DbConnectInf.SetDsn(ODBCSource);                 // ODBC data source name (created with ODBC Administrator under Win95/NT)
-        DbConnectInf.SetUserID(UserName);            // database username - must already exist in the data source
-        DbConnectInf.SetPassword(Password);      // password database username
+        DbConnectInf.SetDsn(ODBCSource);         // ODBC data source name (created with ODBC Administrator under Win95/NT)
+        DbConnectInf.SetUserID(UserName);        // database username - must already exist in the data source
+        DbConnectInf.SetPassword(Password);      // password database username

         db_BrowserDB = wxDbGetConnection(&DbConnectInf);
         // wxLogMessage(">>>%s<<<>>>%s<<<",UserName.c_str(),Password.c_str());
         if (db_BrowserDB == NULL)
         {
         db_BrowserDB = wxDbGetConnection(&DbConnectInf);
         // wxLogMessage(">>>%s<<<>>>%s<<<",UserName.c_str(),Password.c_str());
         if (db_BrowserDB == NULL)
         {

-            DbConnectInf.SetDsn(wxT(""));
-            DbConnectInf.SetUserID(wxT(""));
-            DbConnectInf.SetPassword(wxT(""));
+            DbConnectInf.SetDsn(wxEmptyString);
+            DbConnectInf.SetUserID(wxEmptyString);
+            DbConnectInf.SetPassword(wxEmptyString);

             if (!Quiet)
             {
                 wxLogMessage(_("\n-E-> BrowserDB::OnConnectDataSource() DB CONNECTION ERROR : Unable to connect to the data source.\n\nCheck the name of your data source to verify it has been correctly entered/spelled.\n\nWith some databases, the user name and password must\nbe created with full rights to the table prior to making a connection\n(using tools provided by the database manufacturer)"));
                 wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());
             }
             DbConnectInf.FreeHenv();
             if (!Quiet)
             {
                 wxLogMessage(_("\n-E-> BrowserDB::OnConnectDataSource() DB CONNECTION ERROR : Unable to connect to the data source.\n\nCheck the name of your data source to verify it has been correctly entered/spelled.\n\nWith some databases, the user name and password must\nbe created with full rights to the table prior to making a connection\n(using tools provided by the database manufacturer)"));
                 wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());
             }
             DbConnectInf.FreeHenv();

-            return FALSE;
+            return false;

         }
         //--------------------------------------------------------------------------------------
         if (!Quiet)
         }
         //--------------------------------------------------------------------------------------
         if (!Quiet)


@@ -172,12 +172,12 @@ bool BrowserDB::OnStartDB(int Quiet)
             wxLogMessage(_("-I-> BrowserDB::OnGetDataSourceODBC() - DatabaseName(%s) ; DataSource(%s)"),Temp1.c_str(),Temp2.c_str());
             wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());
         }
             wxLogMessage(_("-I-> BrowserDB::OnGetDataSourceODBC() - DatabaseName(%s) ; DataSource(%s)"),Temp1.c_str(),Temp2.c_str());
             wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());
         }

-        return TRUE;
+        return true;

     }
     else
     {
         DbConnectInf.FreeHenv();
     }
     else
     {
         DbConnectInf.FreeHenv();

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -197,40 +197,42 @@ bool BrowserDB::OnCloseDB(int Quiet)
     }
     if (!Quiet)
         wxLogMessage(_("\n-I-> BrowserDB::OnCloseDB() : End "));
     }
     if (!Quiet)
         wxLogMessage(_("\n-I-> BrowserDB::OnCloseDB() : End "));

-    return TRUE;
+    return true;

 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------

-bool BrowserDB::OnGetNext(int Cols,int Quiet)
+bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))

 {
     SDWORD cb;
 {
     SDWORD cb;

-    int         i_dbDataType;
-    int   i=0;
+    int i_dbDataType;

     wxChar s_temp[1024+1];
     wxChar s_temp[1024+1];

-    long                        l_temp;
-    double                      f_temp;
-    int                         AnzError=0;
+    long l_temp;
+    double f_temp;
+    int AnzError=0;

     TIMESTAMP_STRUCT t_temp;
     wxString Temp0;
     //-----------------------------
     if (!db_BrowserDB->GetNext())
     {
     TIMESTAMP_STRUCT t_temp;
     wxString Temp0;
     //-----------------------------
     if (!db_BrowserDB->GetNext())
     {

-        return FALSE;
+#ifdef __WXDEBUG__

         Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext \n-E-> "));
         Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
         wxLogMessage(Temp0);
         wxMessageBox(Temp0);
         Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext \n-E-> "));
         Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
         wxLogMessage(Temp0);
         wxMessageBox(Temp0);

+#endif
+        return false;

     }
     else
     {
     }
     else
     {

+        int i;

         for (i=0;i<Cols;i++)
         {
             wxStrcpy((cl_BrowserDB+i)->tableName,_T("-E->"));
             i_dbDataType = (cl_BrowserDB+i)->pColFor->i_dbDataType;
         for (i=0;i<Cols;i++)
         {
             wxStrcpy((cl_BrowserDB+i)->tableName,_T("-E->"));
             i_dbDataType = (cl_BrowserDB+i)->pColFor->i_dbDataType;

-            if (i_dbDataType == 0)                                               // Filter unsupported dbDataTypes
+            if (i_dbDataType == 0)         // Filter unsupported dbDataTypes

             {
                 if (((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_VARCHAR) ||
             {
                 if (((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_VARCHAR) ||

-                                                 ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_LONGVARCHAR))
+                          ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_LONGVARCHAR))

                     i_dbDataType = DB_DATA_TYPE_VARCHAR;
                 if ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DATE)
                     i_dbDataType = DB_DATA_TYPE_DATE;
                     i_dbDataType = DB_DATA_TYPE_VARCHAR;
                 if ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DATE)
                     i_dbDataType = DB_DATA_TYPE_DATE;


@@ -242,15 +244,15 @@ bool BrowserDB::OnGetNext(int Cols,int Quiet)
                     i_dbDataType = DB_DATA_TYPE_FLOAT;
             }
             if ((i_dbDataType == DB_DATA_TYPE_INTEGER) &&
                     i_dbDataType = DB_DATA_TYPE_FLOAT;
             }
             if ((i_dbDataType == DB_DATA_TYPE_INTEGER) &&

-                                        ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DOUBLE))
-            {  // DBASE Numeric
+                     ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DOUBLE))
+            {    // DBASE Numeric

                 i_dbDataType = DB_DATA_TYPE_FLOAT;
             }
             switch(i_dbDataType)
             {
             case DB_DATA_TYPE_VARCHAR:
                 i_dbDataType = DB_DATA_TYPE_FLOAT;
             }
             switch(i_dbDataType)
             {
             case DB_DATA_TYPE_VARCHAR:

-                wxStrcpy(s_temp,_T(""));
-                if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_dbDataType,&s_temp,sizeof(s_temp), &cb))
+                wxStrcpy(s_temp,wxEmptyString);
+                if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_dbDataType),&s_temp[0],sizeof(s_temp), &cb))

                 {
                     Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext of >%s<.\n-E-> "),(cl_BrowserDB+i)->tableName);
                     Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
                 {
                     Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext of >%s<.\n-E-> "),(cl_BrowserDB+i)->tableName);
                     Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);


@@ -261,7 +263,7 @@ bool BrowserDB::OnGetNext(int Cols,int Quiet)
                 break;
             case DB_DATA_TYPE_INTEGER:
                 l_temp = 0;
                 break;
             case DB_DATA_TYPE_INTEGER:
                 l_temp = 0;

-                if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&l_temp,sizeof(l_temp), &cb))
+                if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&l_temp,sizeof(l_temp), &cb))

                 {
                     Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
                     Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
                 {
                     Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
                     Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);


@@ -274,7 +276,7 @@ bool BrowserDB::OnGetNext(int Cols,int Quiet)
                 break;
             case DB_DATA_TYPE_FLOAT:
                 f_temp = 0;
                 break;
             case DB_DATA_TYPE_FLOAT:
                 f_temp = 0;

-                if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&f_temp,sizeof(f_temp), &cb))
+                if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&f_temp,sizeof(f_temp), &cb))

                 {
                     Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
                     Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
                 {
                     Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
                     Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);


@@ -287,8 +289,14 @@ bool BrowserDB::OnGetNext(int Cols,int Quiet)
                 }
                 break;
             case DB_DATA_TYPE_DATE:
                 }
                 break;
             case DB_DATA_TYPE_DATE:

-                t_temp.day = t_temp.month = t_temp.year = t_temp.hour = t_temp.minute = t_temp.second = t_temp.fraction = 0;
-                if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&t_temp,sizeof(t_temp), &cb))
+                t_temp.day = 0;
+                t_temp.month = 0;
+                t_temp.year = 0;
+                t_temp.hour = 0;
+                t_temp.minute = 0;
+                t_temp.second = 0;
+                t_temp.fraction = 0;
+                if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&t_temp,sizeof(t_temp), &cb))

                 {
                     Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
                     Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
                 {
                     Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
                     Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);


@@ -296,8 +304,8 @@ bool BrowserDB::OnGetNext(int Cols,int Quiet)
                 else
                 {
                     // i_Nation =  0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
                 else
                 {
                     // i_Nation =  0 = timestamp , 1=EU, 2=UK, 3=International, 4=US

-                    if (((cl_BrowserDB+i)->pColFor->i_Nation == 0)     ||      // TS  YYYY-MM-DD
-                        ((cl_BrowserDB+i)->pColFor->i_Nation == 3))    // IT  YYYY-MM-DD
+                    if (((cl_BrowserDB+i)->pColFor->i_Nation == 0)    ||    // TS  YYYY-MM-DD
+                        ((cl_BrowserDB+i)->pColFor->i_Nation == 3))     // IT  YYYY-MM-DD

                     {
                         Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.year,t_temp.month,t_temp.day,
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
                     {
                         Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.year,t_temp.month,t_temp.day,
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);


@@ -310,7 +318,7 @@ bool BrowserDB::OnGetNext(int Cols,int Quiet)
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
                         wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
                     }
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
                         wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
                     }

-                    if ((cl_BrowserDB+i)->pColFor->i_Nation == 3)         // US  MM/DD/YYYY
+                    if ((cl_BrowserDB+i)->pColFor->i_Nation == 3)    // US  MM/DD/YYYY

                     {
                         Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.month,t_temp.day,t_temp.year,
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
                     {
                         Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.month,t_temp.day,t_temp.year,
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);


@@ -326,7 +334,7 @@ bool BrowserDB::OnGetNext(int Cols,int Quiet)
                     wxLogMessage(_("-E-> BrowserDB::OnGetNext - DB_DATA_TYPE_?? (%d) in Col(%s)"),(cl_BrowserDB+i)->pColFor->i_dbDataType,Temp0.c_str());
                 }
                 else
                     wxLogMessage(_("-E-> BrowserDB::OnGetNext - DB_DATA_TYPE_?? (%d) in Col(%s)"),(cl_BrowserDB+i)->pColFor->i_dbDataType,Temp0.c_str());
                 }
                 else

-                    return TRUE;
+                    return true;

                 Temp0.Printf(_("-E-> unknown Format(%d) - sql(%d)"),(cl_BrowserDB+i)->pColFor->i_dbDataType,(cl_BrowserDB+i)->pColFor->i_sqlDataType);
                 wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
                 break;
                 Temp0.Printf(_("-E-> unknown Format(%d) - sql(%d)"),(cl_BrowserDB+i)->pColFor->i_dbDataType,(cl_BrowserDB+i)->pColFor->i_sqlDataType);
                 wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
                 break;


@@ -334,7 +342,7 @@ bool BrowserDB::OnGetNext(int Cols,int Quiet)
         }  // for
     }  // else
 
         }  // for
     }  // else
 

-    return TRUE;
+    return true;

 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------


@@ -344,14 +352,15 @@ bool BrowserDB::OnSelect(wxString tb_Name, int Quiet)
     wxString SQLStmt;
     i_Records = 0;
     //---------------------------------------------------------------------------------------
     wxString SQLStmt;
     i_Records = 0;
     //---------------------------------------------------------------------------------------

-    SQLStmt.sprintf(_T("SELECT * FROM %s"),db_BrowserDB->SQLTableName(tb_Name.c_str()));
+    wxString tablename = db_BrowserDB->SQLTableName(tb_Name.c_str());
+    SQLStmt.sprintf(_T("SELECT * FROM %s"),tablename.c_str());

     if (!db_BrowserDB->ExecSql((wxChar *)(SQLStmt.GetData())))
     {
         Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());
         Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
         wxLogMessage(Temp0);
         wxMessageBox(_T("-E-> BrowserDB::OnSelect - GetData()"));
     if (!db_BrowserDB->ExecSql((wxChar *)(SQLStmt.GetData())))
     {
         Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());
         Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
         wxLogMessage(Temp0);
         wxMessageBox(_T("-E-> BrowserDB::OnSelect - GetData()"));

-        return FALSE;
+        return false;

     }
     //---------------------------------------------------------------------------------------
     while (db_BrowserDB->GetNext())
     }
     //---------------------------------------------------------------------------------------
     while (db_BrowserDB->GetNext())


@@ -364,16 +373,16 @@ bool BrowserDB::OnSelect(wxString tb_Name, int Quiet)
         Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());
         Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
         wxLogMessage(Temp0);
         Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());
         Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
         wxLogMessage(Temp0);

-        return FALSE;
+        return false;

     }
     //---------------------------------------------------------------------------------------
     }
     //---------------------------------------------------------------------------------------

-    // SetColDefs ( 0,"NAME",    DB_DATA_TYPE_VARCHAR,  Name,     SQL_C_CHAR,          sizeof(Name),    TRUE, TRUE);  // Primary index
+    // SetColDefs ( 0, "NAME", DB_DATA_TYPE_VARCHAR, Name, SQL_C_WXCHAR, sizeof(Name), true, true);  // Primary index

     //---------------------------------------------------------------------------------------
     if (!Quiet)
     {
         wxLogMessage(_("\n-I-> BrowserDB::OnSelect(%s) Records(%d): End - Time needed : %ld ms"),tb_Name.c_str(),i_Records,sw.Time());
     }
     //---------------------------------------------------------------------------------------
     if (!Quiet)
     {
         wxLogMessage(_("\n-I-> BrowserDB::OnSelect(%s) Records(%d): End - Time needed : %ld ms"),tb_Name.c_str(),i_Records,sw.Time());
     }

-    return TRUE;
+    return true;

 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------


@@ -388,17 +397,17 @@ bool BrowserDB::OnExecSql(wxString SQLStmt, int Quiet)
             wxLogMessage(Temp0);
         else
             wxMessageBox(_T("-E-> BrowserDB::OnExecSql - ExecSql()"));
             wxLogMessage(Temp0);
         else
             wxMessageBox(_T("-E-> BrowserDB::OnExecSql - ExecSql()"));

-        return FALSE;
+        return false;

     }
     if (!Quiet)
     {
         // wxLogMessage(_("\n-I-> BrowserDB::OnExecSql(%s) - End - Time needed : %ld ms"),SQLStmt.c_str(),sw.Time());
     }
     }
     if (!Quiet)
     {
         // wxLogMessage(_("\n-I-> BrowserDB::OnExecSql(%s) - End - Time needed : %ld ms"),SQLStmt.c_str(),sw.Time());
     }

-    return TRUE;
+    return true;

 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------

-wxDbInf* BrowserDB::OnGetCatalog(int Quiet)
+wxDbInf* BrowserDB::OnGetCatalog(int WXUNUSED(Quiet))

 {
     wxChar UName[255];
     wxStrcpy(UName,UserName);
 {
     wxChar UName[255];
     wxStrcpy(UName,UserName);


@@ -407,7 +416,7 @@ wxDbInf* BrowserDB::OnGetCatalog(int Quiet)
 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------

-wxDbColInf* BrowserDB::OnGetColumns(wxChar *tableName, UWORD numCols, int Quiet)
+wxDbColInf* BrowserDB::OnGetColumns(wxChar *tableName, UWORD numCols, int WXUNUSED(Quiet))

 {
     wxChar UName[255];
     int i;
 {
     wxChar UName[255];
     int i;


@@ -422,7 +431,7 @@ wxDbColInf* BrowserDB::OnGetColumns(wxChar *tableName, UWORD numCols, int Quiet)
         (cl_BrowserDB+i)->pColFor->Format(1,
                                         (cl_BrowserDB+i)->dbDataType,
                                         (cl_BrowserDB+i)->sqlDataType,
         (cl_BrowserDB+i)->pColFor->Format(1,
                                         (cl_BrowserDB+i)->dbDataType,
                                         (cl_BrowserDB+i)->sqlDataType,

-                                        (cl_BrowserDB+i)->columnSize, 
+                                        (cl_BrowserDB+i)->columnLength,

                                         (cl_BrowserDB+i)->decimalDigits);
     }
     return cl_BrowserDB;
                                         (cl_BrowserDB+i)->decimalDigits);
     }
     return cl_BrowserDB;


@@ -449,10 +458,10 @@ void BrowserDB::PointerToNULL(int Art)
             delete db_BrowserDB;
         }
     }
             delete db_BrowserDB;
         }
     }

-    cl_BrowserDB          = NULL;
-    ct_BrowserDB          = NULL;
-    db_BrowserDB          = NULL;
-    p_LogWindow           = NULL;
+    cl_BrowserDB       = NULL;
+    ct_BrowserDB       = NULL;
+    db_BrowserDB       = NULL;
+    p_LogWindow        = NULL;

 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------


@@ -461,7 +470,7 @@ void BrowserDB::OnFillSqlTyp()
     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[3]  = SQL_C_BOOKMARK;  s_SqlTyp[3]  = _T("SQL_C_BOOKMARK");
     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[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[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[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[7]  = SQL_C_DOUBLE;    s_SqlTyp[7]  = _T("SQL_C_DOUBLE");


@@ -481,7 +490,7 @@ void BrowserDB::OnFillSqlTyp()
     i_SqlTyp[21] = SQL_NUMERIC;     s_SqlTyp[21] = _T("SQL_NUMERIC");
     i_SqlTyp[22] = SQL_LONGVARCHAR; s_SqlTyp[22] = _T("SQL_LONGVARCHAR");
     i_SqlTyp[23] = SQL_REAL;        s_SqlTyp[23] = _T("SQL_REAL");
     i_SqlTyp[21] = SQL_NUMERIC;     s_SqlTyp[21] = _T("SQL_NUMERIC");
     i_SqlTyp[22] = SQL_LONGVARCHAR; s_SqlTyp[22] = _T("SQL_LONGVARCHAR");
     i_SqlTyp[23] = SQL_REAL;        s_SqlTyp[23] = _T("SQL_REAL");

-    i_SqlTyp[0]  = 23;              s_SqlTyp[0]  = _T("");
+    i_SqlTyp[0]  = 23;              s_SqlTyp[0]  = wxEmptyString;

 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------


@@ -491,6 +500,6 @@ void BrowserDB::OnFilldbTyp()
     i_dbTyp[2] = DB_DATA_TYPE_INTEGER; s_dbTyp[2] = _T("DB_DATA_TYPE_INTEGER");
     i_dbTyp[3] = DB_DATA_TYPE_FLOAT;   s_dbTyp[3] = _T("DB_DATA_TYPE_FLOAT");
     i_dbTyp[4] = DB_DATA_TYPE_DATE;    s_dbTyp[4] = _T("DB_DATA_TYPE_DATE");
     i_dbTyp[2] = DB_DATA_TYPE_INTEGER; s_dbTyp[2] = _T("DB_DATA_TYPE_INTEGER");
     i_dbTyp[3] = DB_DATA_TYPE_FLOAT;   s_dbTyp[3] = _T("DB_DATA_TYPE_FLOAT");
     i_dbTyp[4] = DB_DATA_TYPE_DATE;    s_dbTyp[4] = _T("DB_DATA_TYPE_DATE");

-    i_dbTyp[0] = 4;                    s_dbTyp[0] = _T("");
+    i_dbTyp[0] = 4;                    s_dbTyp[0] = wxEmptyString;

 }
 //----------------------------------------------------------------------------------------
 }
 //----------------------------------------------------------------------------------------