Fixed HitTest for columns > 1

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

diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp
index f60902a4e626ac6bea3f97a2e19ac829e8662cbf..0801df5c87d56e1399444126a5934c3e36eb5f38 100644 (file)
--- a/samples/db/listdb.cpp
+++ b/samples/db/listdb.cpp
@@ -51,10 +51,10 @@
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
-#include  <wx/wx.h>
+#include  "wx/wx.h"
 #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 */
 
@@ -89,7 +89,7 @@ extern wxApp *DatabaseDemoApp;
  * NOTE: The value returned by this function is for temporary use only and
  *       should be copied for long term use
  */
-const char *GetExtendedDBErrorMsg2(wxDb *pDb, char *ErrFile, int ErrLine)
+const wxChar *GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *ErrFile, int ErrLine)
 {
     static wxString msg;
     msg = wxT("");
@@ -135,7 +135,7 @@ Clookup::Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &de
                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_CHAR, LOOKUP_COL_LEN+1, false, false);
 
 }  // Clookup()
 
@@ -153,10 +153,10 @@ Clookup2::Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2,
 
     int i = 0;
 
-    SetColDefs (i, colName1, DB_DATA_TYPE_VARCHAR, lookupCol1, SQL_C_CHAR, LOOKUP_COL_LEN+1, FALSE, FALSE);
+    SetColDefs (i, colName1, DB_DATA_TYPE_VARCHAR, lookupCol1, SQL_C_CHAR, LOOKUP_COL_LEN+1, false, false);
 
     if (wxStrlen(colName2) > 0)
-        SetColDefs (++i, colName2, DB_DATA_TYPE_VARCHAR, lookupCol2, SQL_C_CHAR, LOOKUP_COL_LEN+1, FALSE, FALSE);
+        SetColDefs (++i, colName2, DB_DATA_TYPE_VARCHAR, lookupCol2, SQL_C_CHAR, LOOKUP_COL_LEN+1, false, false);
 
 }  // Clookup2()
 
@@ -172,12 +172,12 @@ END_EVENT_TABLE()
 ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
                        wxChar *colName, wxChar *where, wxChar *orderBy,
                        wxDb *pDb, const wxString &defDir)
-   : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxPoint(-1, -1), wxSize(400, 290))
+   : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxDefaultPosition, wxSize(400, 290))
 {
     wxBeginBusyCursor();
     
     wxStrcpy(ListDB_Selection,wxT(""));
-    widgetPtrsSet = FALSE;
+    widgetPtrsSet = false;
     lookup  = 0;
     lookup2 = 0;
     noDisplayCols = 1;
@@ -187,10 +187,10 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     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
-        lookup = new Clookup(tableName, colName, pDb, defDir);
+    lookup = new Clookup(tableName, colName, pDb, defDir);
     if (!lookup)
     {
         wxMessageBox(wxT("Error allocating memory for 'Clookup'object."),wxT("Error..."));
@@ -220,16 +220,16 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     while (lookup->GetNext())
         pLookUpSelectList->Append(lookup->lookupCol);
 
-    // Highlight the first list item
-    pLookUpSelectList->SetSelection(0);
-
     // Make the OK activate by pressing Enter
     if (pLookUpSelectList->GetCount())
+    {
+        pLookUpSelectList->SetSelection(0);
         pLookUpOkBtn->SetDefault();
+    }
     else
     {
         pLookUpCancelBtn->SetDefault();
-        pLookUpOkBtn->Enable(FALSE);
+        pLookUpOkBtn->Enable(false);
     }
 
     // Display the dialog window
@@ -248,7 +248,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
 //    1) 2 columns rather than one
 // 2) The ability to select DISTINCT column values
 //
-// Only set distinctValues equal to TRUE if necessary.  In many cases, the constraints
+// Only set distinctValues equal to true if necessary.  In many cases, the constraints
 // of the index(es) will enforce this uniqueness.  Selecting DISTINCT does require
 // overhead by the database to ensure that all values returned are distinct.  Therefore,
 // use this ONLY when you need it.
@@ -269,13 +269,13 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
                        wxChar *dispCol1, wxChar *dispCol2, wxChar *where, wxChar *orderBy,
                        wxDb *pDb, const wxString &defDir, bool distinctValues, 
                        wxChar *selectStmt, int maxLenCol1, bool allowOk)
-   : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxPoint(-1, -1), wxSize(400, 290))
+   : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxDefaultPosition, wxSize(400, 290))
 {
     wxBeginBusyCursor();
     
     wxStrcpy(ListDB_Selection,wxT(""));
     wxStrcpy(ListDB_Selection2,wxT(""));
-    widgetPtrsSet = FALSE;
+    widgetPtrsSet = false;
     lookup  = 0;
     lookup2 = 0;
     noDisplayCols = (wxStrlen(dispCol2) ? 2 : 1);
@@ -292,10 +292,10 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     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
-        lookup2 = new Clookup2(tableName, dispCol1, dispCol2, pDb, defDir);
+    lookup2 = new Clookup2(tableName, dispCol1, dispCol2, pDb, defDir);
     if (!lookup2)
     {
         wxMessageBox(wxT("Error allocating memory for 'Clookup2' object."),wxT("Error..."));
@@ -307,7 +307,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     {
         wxString tStr;
         tStr.Printf(wxT("Unable to open the table '%s'."),tableName);
-        tStr += GetExtendedDBErrorMsg2(pDb,__FILE__,__LINE__);
+        tStr += GetExtendedDBErrorMsg2(pDb,__TFILE__,__LINE__);
         wxMessageBox(tStr,wxT("ODBC Error..."));
         Close();
         return;
@@ -339,7 +339,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
                 return;
             }
             if (lookup2->GetNext())
-                maxColLen = col1Len = atoi(lookup2->lookupCol1);
+                maxColLen = col1Len = wxAtoi(lookup2->lookupCol1);
             else
                 wxMessageBox(wxT("ODBC error during GetNext()"),wxT("ODBC Error..."));
         }
@@ -359,7 +359,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     {
         lookup2->SetOrderByClause(orderBy);
         lookup2->SetWhereClause(where);
-        if (!lookup2->Query(FALSE, distinctValues))
+        if (!lookup2->Query(false, distinctValues))
         {
             wxMessageBox(wxT("ODBC error during Query()"),wxT("ODBC Error..."));
             Close();
@@ -380,16 +380,16 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
         pLookUpSelectList->Append(s);
     }
 
-    // Highlight the first list item
-    pLookUpSelectList->SetSelection(0);
-
     // Make the OK activate by pressing Enter
     if (pLookUpSelectList->GetCount())
+    {
+        pLookUpSelectList->SetSelection(0);
         pLookUpOkBtn->SetDefault();
+    }
     else
     {
         pLookUpCancelBtn->SetDefault();
-        pLookUpOkBtn->Enable(FALSE);
+        pLookUpOkBtn->Enable(false);
     }
 
     pLookUpOkBtn->Enable(allowOk);
@@ -405,8 +405,8 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
 
 void ClookUpDlg::OnClose(wxCloseEvent& event)
 {
-    widgetPtrsSet = FALSE;
-    GetParent()->Enable(TRUE);
+    widgetPtrsSet = false;
+    GetParent()->Enable(true);
 
     if (lookup)
         delete lookup;
@@ -418,7 +418,7 @@ void ClookUpDlg::OnClose(wxCloseEvent& event)
     while (wxIsBusy()) wxEndBusyCursor();
     event.Skip();
 
-//    return TRUE;
+//    return true;
 
 }  // ClookUpDlg::OnClose
 
@@ -430,7 +430,7 @@ void ClookUpDlg::OnButton( wxCommandEvent &event )
 }
 
 
-void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event)
+void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
 {
     wxString widgetName = win.GetName();