Factory some of wxFilterClassFactory into a base class.

[wxWidgets.git] / samples / db / listdb.cpp

diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp
index e00f3c8740c4523bb6f3854e279ea5c678ca1dff..58bbaa84acb6532d1a917e1355c11b3dc2f151e1 100644 (file)
--- a/samples/db/listdb.cpp
+++ b/samples/db/listdb.cpp
@@ -15,20 +15,20 @@
     Member functions for the classes defined in LISTDB.H
 
      This class is used to present a generic ListBox lookup window for
     Member functions for the classes defined in LISTDB.H
 
      This class is used to present a generic ListBox lookup window for

-     use with any of the object creation/selection choice widgets.   This 
+     use with any of the object creation/selection choice widgets.   This

      dialog window will present a (possibly) scrolling list of values
      that come from a data table source.  Based on the object type passed
      in the constructor, a ListBox is built to present the user with a
      single selection listbox.
 
      The string selected from the list box is stored in the Global variable
      dialog window will present a (possibly) scrolling list of values
      that come from a data table source.  Based on the object type passed
      in the constructor, a ListBox is built to present the user with a
      single selection listbox.
 
      The string selected from the list box is stored in the Global variable

-     "ListDB_Seclection", and will remain set until another interation of this
+     "ListDB_Selection", and will remain set until another interation of this

      routine is called.
 
      For each object (database) type that is to be used, an overridden
      constructor should be written to appropriately link to the proper
      data table/object for building the list.
      routine is called.
 
      For each object (database) type that is to be used, an overridden
      constructor should be written to appropriately link to the proper
      data table/object for building the list.

-       
+

     The data table record access is all handled through the routines
     in this module, interfacing with the methods defined in wxDbTable.
 
     The data table record access is all handled through the routines
     in this module, interfacing with the methods defined in wxDbTable.
 


@@ -36,14 +36,10 @@
      have opened the table prior to passing them in the dialog
      constructor, and the 'where' query should already have been set
      and performed before creating this dialog instance.
      have opened the table prior to passing them in the dialog
      constructor, and the 'where' query should already have been set
      and performed before creating this dialog instance.

-    
+

 // SYNOPSIS STOP
 */
 
 // SYNOPSIS STOP
 */
 

-#ifdef __GNUG__
-#pragma implementation "listdb.h"
-#endif
-

 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__


@@ -51,39 +47,35 @@
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP

-#include  <wx/wx.h>
+#include  "wx/wx.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include <wx/dbtable.h>
+#include "wx/dbtable.h"

 
 extern wxDbList WXDLLEXPORT *PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */
 
 #include "listdb.h"
 
 extern wxDbList WXDLLEXPORT *PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */
 
 #include "listdb.h"

-
-// Global structure for holding ODBC connection information
-extern wxDbConnectInf DbConnectInf;
-
-// Global database connection
-extern wxDb *READONLY_DB;
-
+//#include "dbtest.h"

 
 // Used for passing the selected listbox selection back to the calling
 // routine.  This variable must be declared as 'extern' in the calling
 // source module
 
 // Used for passing the selected listbox selection back to the calling
 // routine.  This variable must be declared as 'extern' in the calling
 // source module

-char ListDB_Selection[LOOKUP_COL_LEN+1];
+wxChar ListDB_Selection[LOOKUP_COL_LEN+1];

 
 // If the listbox contains two columns of data, the second column is
 // returned in this variable.
 
 // If the listbox contains two columns of data, the second column is
 // returned in this variable.

-char ListDB_Selection2[LOOKUP_COL_LEN+1];
+wxChar ListDB_Selection2[LOOKUP_COL_LEN+1];

 
 // Constants
 const int LISTDB_NO_SPACES_BETWEEN_COLS = 3;
 
 
 
 // Constants
 const int LISTDB_NO_SPACES_BETWEEN_COLS = 3;
 
 

+extern wxApp *DatabaseDemoApp;
+

 
 /*
  * This function will return the exact string(s) from the database engine
 
 /*
  * This function will return the exact string(s) from the database engine

- * indicating all error conditions which have just occured during the
+ * indicating all error conditions which have just occurred during the

  * last call to the database engine.
  *
  * This demo uses the returned string by displaying it in a wxMessageBox.  The
  * last call to the database engine.
  *
  * This demo uses the returned string by displaying it in a wxMessageBox.  The


@@ -93,108 +85,112 @@ const int LISTDB_NO_SPACES_BETWEEN_COLS = 3;
  * NOTE: The value returned by this function is for temporary use only and
  *       should be copied for long term use
  */
  * NOTE: The value returned by this function is for temporary use only and
  *       should be copied for long term use
  */

-const char *GetExtendedDBErrorMsg2(char *ErrFile, int ErrLine)
+wxString GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *ErrFile, int ErrLine)

 {
     static wxString msg;
 {
     static wxString msg;

-    msg = "";
+    msg = wxT("");

 
     wxString tStr;
 
     if (ErrFile || ErrLine)
     {
 
     wxString tStr;
 
     if (ErrFile || ErrLine)
     {

-        msg += "File: ";
+        msg += wxT("File: ");

         msg += ErrFile;
         msg += ErrFile;

-        msg += "   Line: ";
-        tStr.Printf("%d",ErrLine);
+        msg += wxT("   Line: ");
+        tStr.Printf(wxT("%d"),ErrLine);

         msg += tStr.c_str();
         msg += tStr.c_str();

-        msg += "\n";
+        msg += wxT("\n");

     }
 
     }
 

-    msg.Append ("\nODBC errors:\n");
-    msg += "\n";
-    
-    /* Scan through each database connection displaying 
-     * any ODBC errors that have occured. */
-    wxDbList *pDbList;
-    for (pDbList = PtrBegDbList; pDbList; pDbList = pDbList->PtrNext)
+    msg.Append (wxT("\nODBC errors:\n"));
+    msg += wxT("\n");
+
+    // Display errors for this connection
+    int i;
+    for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)

     {
     {

-        // Skip over any free connections
-        if (pDbList->Free)
-            continue;
-        // Display errors for this connection
-        for (int i = 0; i < DB_MAX_ERROR_HISTORY; i++)
+        if (pDb->errorList[i])

         {
         {

-            if (pDbList->PtrDb->errorList[i])
-            {
-                msg.Append(pDbList->PtrDb->errorList[i]);
-                if (wxStrcmp(pDbList->PtrDb->errorList[i],"") != 0)
-                    msg.Append("\n");
-                // Clear the errmsg buffer so the next error will not
-                // end up showing the previous error that have occurred
-                wxStrcpy(pDbList->PtrDb->errorList[i],"");
-            }
+            msg.Append(pDb->errorList[i]);
+            if (wxStrcmp(pDb->errorList[i],wxT("")) != 0)
+                msg.Append(wxT("\n"));
+            // Clear the errmsg buffer so the next error will not
+            // end up showing the previous error that have occurred
+            wxStrcpy(pDb->errorList[i],wxT(""));

         }
     }
         }
     }

-    msg += "\n";
+    msg += wxT("\n");

 
 

-    return /*(char*) (const char*) msg*/msg.c_str();
+    return msg;

 }  // GetExtendedDBErrorMsg
 
 
 }  // GetExtendedDBErrorMsg
 
 

-

 // Clookup constructor
 // Clookup constructor

-Clookup::Clookup(char *tblName, char *colName) : wxDbTable(READONLY_DB, tblName, 1, NULL, !wxDB_QUERY_ONLY, DbConnectInf.defaultDir)
+Clookup::Clookup(wxString tblName, wxString colName, wxDb *pDb, const wxString &defDir)
+   : wxDbTable(pDb, tblName, 1, (const wxString &)wxEmptyString, !wxDB_QUERY_ONLY,
+               defDir)

 {
 
 {
 

-    SetColDefs (0, colName, DB_DATA_TYPE_VARCHAR, lookupCol, SQL_C_CHAR, LOOKUP_COL_LEN+1, FALSE, FALSE);
+    SetColDefs (0, colName, DB_DATA_TYPE_VARCHAR, lookupCol, SQL_C_WXCHAR, LOOKUP_COL_LEN+1, false, false);

 
 }  // Clookup()
 
 
 // Clookup2 constructor
 
 }  // Clookup()
 
 
 // Clookup2 constructor

-Clookup2::Clookup2(char *tblName, char *colName1, char *colName2, wxDb *pDb)
-   : wxDbTable(pDb, tblName, (1 + (wxStrlen(colName2) > 0)), NULL, !wxDB_QUERY_ONLY, DbConnectInf.defaultDir)
+Clookup2::Clookup2(wxString tblName, wxString colName1, wxString colName2,
+                   wxDb *pDb, const wxString &defDir)
+   : wxDbTable(pDb, tblName, (UWORD)(1 + (wxStrlen(colName2) > 0)), (const wxString &)wxEmptyString,
+               !wxDB_QUERY_ONLY, defDir)

 {
 {

+    wxASSERT(pDb);
+    wxASSERT(tblName);
+    wxASSERT(colName1);
+    wxASSERT(colName2);
+

     int i = 0;
 
     int i = 0;
 

-    SetColDefs (i, colName1, DB_DATA_TYPE_VARCHAR, lookupCol1, SQL_C_CHAR, LOOKUP_COL_LEN+1, FALSE, FALSE);
+    SetColDefs ((UWORD)i, colName1, DB_DATA_TYPE_VARCHAR, lookupCol1, SQL_C_WXCHAR, LOOKUP_COL_LEN+1, false, false);

 
     if (wxStrlen(colName2) > 0)
 
     if (wxStrlen(colName2) > 0)

-        SetColDefs (++i, colName2, DB_DATA_TYPE_VARCHAR, lookupCol2, SQL_C_CHAR, LOOKUP_COL_LEN+1, FALSE, FALSE);
+        SetColDefs ((UWORD)(++i), colName2, DB_DATA_TYPE_VARCHAR, lookupCol2, SQL_C_WXCHAR, LOOKUP_COL_LEN+1, false, false);

 
 }  // Clookup2()
 
 
 BEGIN_EVENT_TABLE(ClookUpDlg, wxDialog)
 
 }  // Clookup2()
 
 
 BEGIN_EVENT_TABLE(ClookUpDlg, wxDialog)

-//     EVT_LISTBOX(LOOKUP_DIALOG_SELECT, ClookUpDlg::SelectCallback)

     EVT_BUTTON(LOOKUP_DIALOG_OK,  ClookUpDlg::OnButton)
     EVT_BUTTON(LOOKUP_DIALOG_CANCEL,  ClookUpDlg::OnButton)
     EVT_CLOSE(ClookUpDlg::OnClose)
     EVT_BUTTON(LOOKUP_DIALOG_OK,  ClookUpDlg::OnButton)
     EVT_BUTTON(LOOKUP_DIALOG_CANCEL,  ClookUpDlg::OnButton)
     EVT_CLOSE(ClookUpDlg::OnClose)

+    EVT_LISTBOX_DCLICK(LOOKUP_DIALOG_SELECT,  ClookUpDlg::OnDClick)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+

 // This is a generic lookup constructor that will work with any table and any column
 // This is a generic lookup constructor that will work with any table and any column

-ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, char *colName,
-    char *where, char *orderBy)  : wxDialog (parent, LOOKUP_DIALOG, "Select...", wxPoint(-1, -1), wxSize(400, 290))
+ClookUpDlg::ClookUpDlg(wxWindow *parent, const wxString &windowTitle, const wxString &tableName,
+                       const wxString &colName, const wxString &where, const wxString &orderBy,
+                       wxDb *pDb, const wxString &defDir)
+   : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxDefaultPosition, wxSize(400, 290))

 {
     wxBeginBusyCursor();
 {
     wxBeginBusyCursor();

-    
-    wxStrcpy(ListDB_Selection,"");
-    widgetPtrsSet = FALSE;
+
+    wxStrcpy(ListDB_Selection,wxT(""));
+    widgetPtrsSet = false;

     lookup  = 0;
     lookup2 = 0;
     noDisplayCols = 1;
     col1Len = 0;
 
     lookup  = 0;
     lookup2 = 0;
     noDisplayCols = 1;
     col1Len = 0;
 

-    pLookUpSelectList       = new wxListBox(this, LOOKUP_DIALOG_SELECT,             wxPoint(  5,  15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, "LookUpSelectList");
-    pLookUpOkBtn            = new wxButton(this, LOOKUP_DIALOG_OK,      "&Ok",      wxPoint(113, 222), wxSize( 70,  35), 0, wxDefaultValidator, "LookUpOkBtn");
-    pLookUpCancelBtn        = new wxButton(this, LOOKUP_DIALOG_CANCEL,  "C&ancel",  wxPoint(212, 222), wxSize( 70,  35), 0, wxDefaultValidator, "LookUpCancelBtn");
+    pLookUpSelectList = new wxListBox(this, LOOKUP_DIALOG_SELECT,                  wxPoint(  5,  15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("LookUpSelectList"));
+    pLookUpOkBtn      = new wxButton(this,  LOOKUP_DIALOG_OK,      wxT("&Ok"),     wxPoint(113, 222), wxSize( 70,  35), 0, wxDefaultValidator, wxT("LookUpOkBtn"));
+    pLookUpCancelBtn  = new wxButton(this,  LOOKUP_DIALOG_CANCEL,  wxT("C&ancel"), wxPoint(212, 222), wxSize( 70,  35), 0, wxDefaultValidator, wxT("LookUpCancelBtn"));

 
 

-    widgetPtrsSet = TRUE;
+    widgetPtrsSet = true;

 
     // Query the lookup table and display the result set
 
     // Query the lookup table and display the result set

-    if (!(lookup = new Clookup(tableName, colName)))
+    lookup = new Clookup(tableName, colName, pDb, defDir);
+    if (!lookup)

     {
     {

-        wxMessageBox("Error allocating memory for 'Clookup'object.","Error...");
+        wxMessageBox(wxT("Error allocating memory for 'Clookup' object."),wxT("Error..."));

         Close();
         return;
     }
         Close();
         return;
     }


@@ -202,8 +198,10 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, cha
     if (!lookup->Open())
     {
         wxString tStr;
     if (!lookup->Open())
     {
         wxString tStr;

-        tStr.Printf("Unable to open the table '%s'.",tableName);
-        wxMessageBox(tStr,"ODBC Error...");
+        tStr.Printf(wxT("Unable to open the table '%s'."), tableName.c_str());
+        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup->GetDb(),__TFILE__,__LINE__),
+                    wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
+

         Close();
         return;
     }
         Close();
         return;
     }


@@ -212,7 +210,11 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, cha
     lookup->SetWhereClause(where);
     if (!lookup->Query())
     {
     lookup->SetWhereClause(where);
     if (!lookup->Query())
     {

-        wxMessageBox("ODBC error during Query()","ODBC Error...");
+        wxString tStr;
+        tStr = wxT("ODBC error during Query()\n\n");
+        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup->GetDb(),__TFILE__,__LINE__),
+                    wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
+

         Close();
         return;
     }
         Close();
         return;
     }


@@ -221,16 +223,16 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, cha
     while (lookup->GetNext())
         pLookUpSelectList->Append(lookup->lookupCol);
 
     while (lookup->GetNext())
         pLookUpSelectList->Append(lookup->lookupCol);
 

-    // Highlight the first list item
-    pLookUpSelectList->SetSelection(0);
-

     // Make the OK activate by pressing Enter
     // Make the OK activate by pressing Enter

-    if (pLookUpSelectList->Number())
+    if (pLookUpSelectList->GetCount())
+    {
+        pLookUpSelectList->SetSelection(0);

         pLookUpOkBtn->SetDefault();
         pLookUpOkBtn->SetDefault();

+    }

     else
     {
         pLookUpCancelBtn->SetDefault();
     else
     {
         pLookUpCancelBtn->SetDefault();

-        pLookUpOkBtn->Enable(FALSE);
+        pLookUpOkBtn->Enable(false);

     }
 
     // Display the dialog window
     }
 
     // Display the dialog window


@@ -258,45 +260,50 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName, cha
 // necessary if joins are involved since by default both columns must come from the
 // same table.
 //
 // necessary if joins are involved since by default both columns must come from the
 // same table.
 //

-// If you do query by sql statement, you must pass in the maximum lenght of column1,
+// If you do query by sql statement, you must pass in the maximum length of column1,

 // since it cannot be derived when you query using your own sql statement.
 //
 // The optional database connection can be used if you'd like the lookup class
 // since it cannot be derived when you query using your own sql statement.
 //
 // The optional database connection can be used if you'd like the lookup class

-// to use a database pointer other than the global READONLY_DB.  This is necessary if
+// to use a database pointer other than wxGetApp().READONLY_DB.  This is necessary if

 // records are being saved, but not committed to the db, yet should be included
 // in the lookup window.
 //
 // records are being saved, but not committed to the db, yet should be included
 // in the lookup window.
 //

-ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
-    char *dispCol1, char *dispCol2, char *where, char *orderBy, bool distinctValues,
-    char *selectStmt, int maxLenCol1, wxDb *pDb, bool allowOk)  : wxDialog (parent, LOOKUP_DIALOG, "Select...", wxPoint(-1, -1), wxSize(400, 290))
+ClookUpDlg::ClookUpDlg(wxWindow *parent, const wxString &windowTitle, const wxString &tableName,
+                       const wxString &dispCol1, const wxString &dispCol2,
+                       const wxString &where, const wxString &orderBy,
+                       wxDb *pDb, const wxString &defDir, bool distinctValues,
+                       const wxString &selectStmt, int maxLenCol1, bool allowOk)
+   : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxDefaultPosition, wxSize(400, 290))

 {
     wxBeginBusyCursor();
 {
     wxBeginBusyCursor();

-    
-    wxStrcpy(ListDB_Selection,"");
-    wxStrcpy(ListDB_Selection2,"");
-    widgetPtrsSet = FALSE;
+
+    wxStrcpy(ListDB_Selection,wxT(""));
+    wxStrcpy(ListDB_Selection2,wxT(""));
+    widgetPtrsSet = false;

     lookup  = 0;
     lookup2 = 0;
     lookup  = 0;
     lookup2 = 0;

-    noDisplayCols = (wxStrlen(dispCol2) ? 2 : 1);
+
+    noDisplayCols = (dispCol2.Length() == 0 ? 1 : 2);

     col1Len = 0;
 
     col1Len = 0;
 

-    wxFont fixedFont(12,wxMODERN,wxNORMAL,wxNORMAL);
+    wxFont fixedFont(12, wxMODERN, wxNORMAL, wxNORMAL);

 
     // this is done with fixed font so that the second column (if any) will be left
     // justified in the second column
 
     // this is done with fixed font so that the second column (if any) will be left
     // justified in the second column

-    pLookUpSelectList        = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint(5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, "LookUpSelectList");
+    pLookUpSelectList        = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint(5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("LookUpSelectList"));

 
     pLookUpSelectList->SetFont(fixedFont);
 
 
     pLookUpSelectList->SetFont(fixedFont);
 

-    pLookUpOkBtn            = new wxButton(this, LOOKUP_DIALOG_OK,      "&Ok",        wxPoint(113, 222), wxSize(70, 35), 0, wxDefaultValidator, "LookUpOkBtn");
-    pLookUpCancelBtn        = new wxButton(this, LOOKUP_DIALOG_CANCEL,  "C&ancel",    wxPoint(212, 222), wxSize(70, 35), 0, wxDefaultValidator, "LookUpCancelBtn");
+    pLookUpOkBtn            = new wxButton(this, LOOKUP_DIALOG_OK,      wxT("&Ok"),        wxPoint(113, 222), wxSize(70, 35), 0, wxDefaultValidator, wxT("LookUpOkBtn"));
+    pLookUpCancelBtn        = new wxButton(this, LOOKUP_DIALOG_CANCEL,  wxT("C&ancel"),    wxPoint(212, 222), wxSize(70, 35), 0, wxDefaultValidator, wxT("LookUpCancelBtn"));

 
 

-    widgetPtrsSet = TRUE;
+    widgetPtrsSet = true;

 
     // Query the lookup table and display the result set
 
     // Query the lookup table and display the result set

-    if (!(lookup2 = new Clookup2(tableName, dispCol1, dispCol2, pDb)))
+    lookup2 = new Clookup2(tableName, dispCol1, dispCol2, pDb, defDir);
+    if (!lookup2)

     {
     {

-        wxMessageBox("Error allocating memory for 'Clookup2'object.","Error...");
+        wxMessageBox(wxT("Error allocating memory for 'Clookup2' object."),wxT("Error..."));

         Close();
         return;
     }
         Close();
         return;
     }


@@ -304,42 +311,53 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
     if (!lookup2->Open())
     {
         wxString tStr;
     if (!lookup2->Open())
     {
         wxString tStr;

-        tStr.Printf("Unable to open the table '%s'.",tableName);
-        tStr += GetExtendedDBErrorMsg2(__FILE__,__LINE__);
-        wxMessageBox(tStr,"ODBC Error...");
+        tStr.Printf(wxT("Unable to open the table '%s'."),tableName.c_str());
+        tStr += GetExtendedDBErrorMsg2(pDb,__TFILE__,__LINE__);
+        wxMessageBox(tStr,wxT("ODBC Error..."));

         Close();
         return;
     }
 
     // If displaying 2 columns, determine the maximum length of column1
     int maxColLen;
         Close();
         return;
     }
 
     // If displaying 2 columns, determine the maximum length of column1
     int maxColLen;

-    if (maxLenCol1)
+    if (maxLenCol1 > 0)

         maxColLen = col1Len = maxLenCol1;  // user passed in max col length for column 1
     else
     {
         maxColLen = col1Len = maxLenCol1;  // user passed in max col length for column 1
     else
     {

+        // NOTE: Some databases (Firebird/Interbase) cannot handle the "fn" and "MAX()" functions
+

         maxColLen = LOOKUP_COL_LEN;
         if (wxStrlen(dispCol2))
         {
         maxColLen = LOOKUP_COL_LEN;
         if (wxStrlen(dispCol2))
         {

-            wxString q = "SELECT MAX({fn LENGTH(";
+            wxString q = wxT("SELECT MAX({fn LENGTH(");

             q += dispCol1;
             q += dispCol1;

-            q += ")}), NULL";
-            q += " FROM ";
+            q += wxT(")}), NULL");
+            q += wxT(" FROM ");

             q += tableName;
             if (wxStrlen(where))
             {
             q += tableName;
             if (wxStrlen(where))
             {

-                q += " WHERE ";
+                q += wxT(" WHERE ");

                 q += where;
             }
                 q += where;
             }

-            if (!lookup2->QueryBySqlStmt((char*) (const char*) q))
+            if (!lookup2->QueryBySqlStmt(q))

             {
             {

-                wxMessageBox("ODBC error during QueryBySqlStmt()","ODBC Error...");
+                wxString tStr;
+                tStr = wxT("ODBC error during QueryBySqlStmt()\n\n");
+                wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup2->GetDb(),__TFILE__,__LINE__),
+                            wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
+

                 Close();
                 return;
             }
             if (lookup2->GetNext())
                 Close();
                 return;
             }
             if (lookup2->GetNext())

-                maxColLen = col1Len = atoi(lookup2->lookupCol1);
+                maxColLen = col1Len = wxAtoi(lookup2->lookupCol1);

             else
             else

-                wxMessageBox("ODBC error during GetNext()","ODBC Error...");
+            {
+                wxString tStr;
+                tStr = wxT("ODBC error during GetNext()\n\n");
+                wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup2->GetDb(),__TFILE__,__LINE__),
+                            wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
+            }

         }
     }
 
         }
     }
 


@@ -348,7 +366,11 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
     {
         if (!lookup2->QueryBySqlStmt(selectStmt))
         {
     {
         if (!lookup2->QueryBySqlStmt(selectStmt))
         {

-            wxMessageBox("ODBC error during QueryBySqlStmt()","ODBC Error...");
+            wxString tStr;
+            tStr = wxT("ODBC error during QueryBySqlStmt()\n\n");
+            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup2->GetDb(),__TFILE__,__LINE__),
+                        wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
+

             Close();
             return;
         }
             Close();
             return;
         }


@@ -357,9 +379,13 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
     {
         lookup2->SetOrderByClause(orderBy);
         lookup2->SetWhereClause(where);
     {
         lookup2->SetOrderByClause(orderBy);
         lookup2->SetWhereClause(where);

-        if (!lookup2->Query(FALSE, distinctValues))
+        if (!lookup2->Query(false, distinctValues))

         {
         {

-            wxMessageBox("ODBC error during Query()","ODBC Error...");
+            wxString tStr;
+            tStr = wxT("ODBC error during Query()\n\n");
+            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup2->GetDb(),__TFILE__,__LINE__),
+                        wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
+

             Close();
             return;
         }
             Close();
             return;
         }


@@ -372,22 +398,22 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
         s = lookup2->lookupCol1;
         if (wxStrlen(dispCol2))        // Append the optional column 2
         {
         s = lookup2->lookupCol1;
         if (wxStrlen(dispCol2))        // Append the optional column 2
         {

-            s.Append(' ', (maxColLen + LISTDB_NO_SPACES_BETWEEN_COLS - wxStrlen(lookup2->lookupCol1)));
+            s.Append(wxT(' '), (maxColLen + LISTDB_NO_SPACES_BETWEEN_COLS - wxStrlen(lookup2->lookupCol1)));

             s.Append(lookup2->lookupCol2);
         }
         pLookUpSelectList->Append(s);
     }
 
             s.Append(lookup2->lookupCol2);
         }
         pLookUpSelectList->Append(s);
     }
 

-    // Highlight the first list item
-    pLookUpSelectList->SetSelection(0);
-

     // Make the OK activate by pressing Enter
     // Make the OK activate by pressing Enter

-    if (pLookUpSelectList->Number())
+    if (pLookUpSelectList->GetCount())
+    {
+        pLookUpSelectList->SetSelection(0);

         pLookUpOkBtn->SetDefault();
         pLookUpOkBtn->SetDefault();

+    }

     else
     {
         pLookUpCancelBtn->SetDefault();
     else
     {
         pLookUpCancelBtn->SetDefault();

-        pLookUpOkBtn->Enable(FALSE);
+        pLookUpOkBtn->Enable(false);

     }
 
     pLookUpOkBtn->Enable(allowOk);
     }
 
     pLookUpOkBtn->Enable(allowOk);


@@ -403,8 +429,8 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, char *windowTitle, char *tableName,
 
 void ClookUpDlg::OnClose(wxCloseEvent& event)
 {
 
 void ClookUpDlg::OnClose(wxCloseEvent& event)
 {

-    widgetPtrsSet = FALSE;
-    GetParent()->Enable(TRUE);
+    widgetPtrsSet = false;
+    GetParent()->Enable(true);

 
     if (lookup)
         delete lookup;
 
     if (lookup)
         delete lookup;


@@ -416,11 +442,18 @@ void ClookUpDlg::OnClose(wxCloseEvent& event)
     while (wxIsBusy()) wxEndBusyCursor();
     event.Skip();
 
     while (wxIsBusy()) wxEndBusyCursor();
     event.Skip();
 

-//    return TRUE;
+//    return true;

 
 }  // ClookUpDlg::OnClose
 
 
 
 }  // ClookUpDlg::OnClose
 
 

+void ClookUpDlg::OnDClick( wxCommandEvent &event )
+{
+  wxWindow *win = (wxWindow*) event.GetEventObject();
+  OnCommand( *win, event );
+}
+
+

 void ClookUpDlg::OnButton( wxCommandEvent &event )
 {
   wxWindow *win = (wxWindow*) event.GetEventObject();
 void ClookUpDlg::OnButton( wxCommandEvent &event )
 {
   wxWindow *win = (wxWindow*) event.GetEventObject();


@@ -428,14 +461,21 @@ void ClookUpDlg::OnButton( wxCommandEvent &event )
 }
 
 
 }
 
 

-void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event)
+void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))

 {
     wxString widgetName = win.GetName();
 
     if (widgetPtrsSet)
     {
 {
     wxString widgetName = win.GetName();
 
     if (widgetPtrsSet)
     {

+        bool doubleclick = false;
+        // Double click
+        if (widgetName == pLookUpSelectList->GetName())
+        {
+            doubleclick = true;
+        }  // Double click
+

         // OK Button
         // OK Button

-        if (widgetName == pLookUpOkBtn->GetName())
+        if (widgetName == pLookUpOkBtn->GetName() || doubleclick)

         {
             if (pLookUpSelectList->GetSelection() != -1)
             {
         {
             if (pLookUpSelectList->GetSelection() != -1)
             {


@@ -457,8 +497,8 @@ void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event)
             }
             else
             {
             }
             else
             {

-                wxStrcpy(ListDB_Selection,"");
-                wxStrcpy(ListDB_Selection2,"");
+                wxStrcpy(ListDB_Selection,wxT(""));
+                wxStrcpy(ListDB_Selection2,wxT(""));

             }
             Close();
         }  // OK Button
             }
             Close();
         }  // OK Button


@@ -466,12 +506,13 @@ void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event)
         // Cancel Button
         if (widgetName == pLookUpCancelBtn->GetName())
         {
         // Cancel Button
         if (widgetName == pLookUpCancelBtn->GetName())
         {

-            wxStrcpy (ListDB_Selection,"");
-            wxStrcpy (ListDB_Selection2,"");
+            wxStrcpy (ListDB_Selection,wxT(""));
+            wxStrcpy (ListDB_Selection2,wxT(""));

             Close();
         }  // Cancel Button
             Close();
         }  // Cancel Button

+

     }
 
     }
 

-};  // ClookUpDlg::OnCommand
+}  // ClookUpDlg::OnCommand

 
 // *********************************** listdb.cpp **********************************
 
 // *********************************** listdb.cpp **********************************