X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f21b2fd89d02837dfd0d195f8ff0f3f5640af017..659ade8c5b948b775ba278837659f10bf66b4844:/samples/db/listdb.cpp diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp index fb68ff5be0..5cfbc84f79 100644 --- a/samples/db/listdb.cpp +++ b/samples/db/listdb.cpp @@ -15,7 +15,7 @@ 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 @@ -28,7 +28,7 @@ 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. @@ -36,7 +36,7 @@ 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 */ @@ -51,10 +51,10 @@ #endif //__BORLANDC__ #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif //WX_PRECOMP -#include +#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(""); @@ -108,7 +108,7 @@ const char *GetExtendedDBErrorMsg2(wxDb *pDb, char *ErrFile, int ErrLine) 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++) @@ -131,7 +131,7 @@ const char *GetExtendedDBErrorMsg2(wxDb *pDb, char *ErrFile, int ErrLine) // Clookup constructor Clookup::Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir) - : wxDbTable(pDb, tblName, 1, wxT(""), !wxDB_QUERY_ONLY, + : wxDbTable(pDb, tblName, 1, wxEmptyString, !wxDB_QUERY_ONLY, defDir) { @@ -143,7 +143,7 @@ Clookup::Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &de // Clookup2 constructor Clookup2::Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb, const wxString &defDir) - : wxDbTable(pDb, tblName, (1 + (wxStrlen(colName2) > 0)), wxT(""), + : wxDbTable(pDb, tblName, (UWORD)(1 + (wxStrlen(colName2) > 0)), wxEmptyString, !wxDB_QUERY_ONLY, defDir) { wxASSERT(pDb); @@ -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 ((UWORD)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 ((UWORD)(++i), colName2, DB_DATA_TYPE_VARCHAR, lookupCol2, SQL_C_CHAR, LOOKUP_COL_LEN+1, false, false); } // Clookup2() @@ -172,10 +172,10 @@ 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; lookup = 0; @@ -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->Number()) + if (pLookUpSelectList->GetCount()) + { + pLookUpSelectList->SetSelection(0); pLookUpOkBtn->SetDefault(); + } else { pLookUpCancelBtn->SetDefault(); @@ -257,7 +257,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, // 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 @@ -267,12 +267,12 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, // ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, wxChar *dispCol1, wxChar *dispCol2, wxChar *where, wxChar *orderBy, - wxDb *pDb, const wxString &defDir, bool distinctValues, + 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; @@ -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->Number()) + 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();