X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f8f7c77d3daef7fd1715752d3f739b55a0015d7..baaa1d1a58224f2d1509965e5e9d9e8fd5799cf0:/samples/db/listdb.cpp

diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp
index f60902a4e6..c95a3fc898 100644
--- 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("");
@@ -190,7 +190,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     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,12 +220,12 @@ 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();
@@ -295,7 +295,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     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..."));
         }
@@ -380,12 +380,12 @@ 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();
@@ -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();