Fixed HitTest for columns > 1

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

diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp
index fb68ff5be09602cf84eab783922a329b2923f00d..0801df5c87d56e1399444126a5934c3e36eb5f38 100644 (file)
--- a/samples/db/listdb.cpp
+++ b/samples/db/listdb.cpp
@@ -51,10 +51,10 @@
 #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 */
 
 
 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
  */
  * 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("");
 {
     static wxString msg;
     msg = wxT("");


@@ -172,7 +172,7 @@ END_EVENT_TABLE()
 ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
                        wxChar *colName, wxChar *where, wxChar *orderBy,
                        wxDb *pDb, const wxString &defDir)
 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();
     
 {
     wxBeginBusyCursor();
     


@@ -190,7 +190,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     widgetPtrsSet = true;
 
     // Query the lookup table and display the result set
     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..."));
     if (!lookup)
     {
         wxMessageBox(wxT("Error allocating memory for 'Clookup'object."),wxT("Error..."));


@@ -220,12 +220,12 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     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();


@@ -269,7 +269,7 @@ 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)
                        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();
     
 {
     wxBeginBusyCursor();
     


@@ -295,7 +295,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     widgetPtrsSet = true;
 
     // Query the lookup table and display the result set
     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..."));
     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);
     {
         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;
         wxMessageBox(tStr,wxT("ODBC Error..."));
         Close();
         return;


@@ -339,7 +339,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
                 return;
             }
             if (lookup2->GetNext())
                 return;
             }
             if (lookup2->GetNext())

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

             else
                 wxMessageBox(wxT("ODBC error during GetNext()"),wxT("ODBC Error..."));
         }
             else
                 wxMessageBox(wxT("ODBC error during GetNext()"),wxT("ODBC Error..."));
         }


@@ -380,12 +380,12 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
         pLookUpSelectList->Append(s);
     }
 
         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();


@@ -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();
 
 {
     wxString widgetName = win.GetName();