X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74de91cc974062b9eaddc7c0ccbfb07013bd0611..659ade8c5b948b775ba278837659f10bf66b4844:/samples/db/listdb.cpp diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp index 89a795c70a..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 */ @@ -108,7 +108,7 @@ const wxChar *GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *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,11 +131,11 @@ const wxChar *GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *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) { - 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() @@ -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,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,7 +187,7 @@ 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); @@ -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. @@ -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,15 +267,15 @@ 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; + widgetPtrsSet = false; lookup = 0; lookup2 = 0; noDisplayCols = (wxStrlen(dispCol2) ? 2 : 1); @@ -292,7 +292,7 @@ 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); @@ -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