X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f6c54eb076d760cbb6fb15e899f15fbbd575850..9180b5352f9d5b5bcccee563e9b3c0f68c4f1303:/samples/db/listdb.cpp?ds=sidebyside diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp index ccf40bebb6..ff93287333 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) +wxString 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++) @@ -125,25 +125,25 @@ const char *GetExtendedDBErrorMsg2(wxDb *pDb, char *ErrFile, int ErrLine) } msg += wxT("\n"); - return msg.c_str(); + return msg; } // GetExtendedDBErrorMsg // Clookup constructor -Clookup::Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir) - : wxDbTable(pDb, tblName, 1, wxT(""), !wxDB_QUERY_ONLY, +Clookup::Clookup(wxString tblName, wxString colName, wxDb *pDb, const wxString &defDir) + : wxDbTable(pDb, tblName, 1, (const wxString &)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_WXCHAR, LOOKUP_COL_LEN+1, false, false); } // Clookup() // Clookup2 constructor -Clookup2::Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, +Clookup2::Clookup2(wxString tblName, wxString colName1, wxString colName2, wxDb *pDb, const wxString &defDir) - : wxDbTable(pDb, tblName, (1 + (wxStrlen(colName2) > 0)), wxT(""), + : wxDbTable(pDb, tblName, (UWORD)(1 + (wxStrlen(colName2) > 0)), (const wxString &)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_WXCHAR, 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_WXCHAR, LOOKUP_COL_LEN+1, false, false); } // Clookup2() @@ -165,35 +165,36 @@ BEGIN_EVENT_TABLE(ClookUpDlg, wxDialog) EVT_BUTTON(LOOKUP_DIALOG_OK, ClookUpDlg::OnButton) EVT_BUTTON(LOOKUP_DIALOG_CANCEL, ClookUpDlg::OnButton) EVT_CLOSE(ClookUpDlg::OnClose) + EVT_LISTBOX_DCLICK(LOOKUP_DIALOG_SELECT, ClookUpDlg::OnDClick) END_EVENT_TABLE() // This is a generic lookup constructor that will work with any table and any column -ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, - wxChar *colName, wxChar *where, wxChar *orderBy, +ClookUpDlg::ClookUpDlg(wxWindow *parent, const wxString &windowTitle, const wxString &tableName, + const wxString &colName, const wxString &where, const wxString &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; col1Len = 0; - pLookUpSelectList = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint( 5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("LookUpSelectList")); - 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")); + pLookUpSelectList = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint( 5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("LookUpSelectList")); + 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); if (!lookup) { - wxMessageBox(wxT("Error allocating memory for 'Clookup'object."),wxT("Error...")); + wxMessageBox(wxT("Error allocating memory for 'Clookup' object."),wxT("Error...")); Close(); return; } @@ -201,8 +202,8 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, if (!lookup->Open()) { wxString tStr; - tStr.Printf(wxT("Unable to open the table '%s'."),tableName); - wxMessageBox(tStr,wxT("ODBC Error...")); + tStr.Printf(wxT("Unable to open the table '%s'."), tableName.c_str()); + wxMessageBox(tStr, wxT("ODBC Error...")); Close(); return; } @@ -211,7 +212,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, lookup->SetWhereClause(where); if (!lookup->Query()) { - wxMessageBox(wxT("ODBC error during Query()"),wxT("ODBC Error...")); + wxMessageBox(wxT("ODBC error during Query()"), wxT("ODBC Error...")); Close(); return; } @@ -220,16 +221,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 +249,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 +258,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 @@ -265,23 +266,25 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, // records are being saved, but not committed to the db, yet should be included // in the lookup window. // -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)) +ClookUpDlg::ClookUpDlg(wxWindow *parent, const wxString &windowTitle, const wxString &tableName, + const wxString &dispCol1, const wxString &dispCol2, + const wxString &where, const wxString &orderBy, + wxDb *pDb, const wxString &defDir, bool distinctValues, + const wxString &selectStmt, int maxLenCol1, bool allowOk) + : 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); + + noDisplayCols = (dispCol2.Length() == 0 ? 1 : 2); col1Len = 0; - wxFont fixedFont(12,wxMODERN,wxNORMAL,wxNORMAL); + wxFont fixedFont(12, wxMODERN, wxNORMAL, wxNORMAL); // this is done with fixed font so that the second column (if any) will be left // justified in the second column @@ -292,7 +295,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); @@ -306,8 +309,8 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, if (!lookup2->Open()) { wxString tStr; - tStr.Printf(wxT("Unable to open the table '%s'."),tableName); - tStr += GetExtendedDBErrorMsg2(pDb,__FILE__,__LINE__); + tStr.Printf(wxT("Unable to open the table '%s'."),tableName.c_str()); + tStr += GetExtendedDBErrorMsg2(pDb,__TFILE__,__LINE__); wxMessageBox(tStr,wxT("ODBC Error...")); Close(); return; @@ -339,7 +342,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 +362,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 +383,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 +408,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,11 +421,18 @@ void ClookUpDlg::OnClose(wxCloseEvent& event) while (wxIsBusy()) wxEndBusyCursor(); event.Skip(); -// return TRUE; +// return true; } // ClookUpDlg::OnClose +void ClookUpDlg::OnDClick( wxCommandEvent &event ) +{ + wxWindow *win = (wxWindow*) event.GetEventObject(); + OnCommand( *win, event ); +} + + void ClookUpDlg::OnButton( wxCommandEvent &event ) { wxWindow *win = (wxWindow*) event.GetEventObject(); @@ -430,14 +440,21 @@ void ClookUpDlg::OnButton( wxCommandEvent &event ) } -void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event) +void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event)) { wxString widgetName = win.GetName(); if (widgetPtrsSet) { + bool doubleclick = false; + // Double click + if (widgetName == pLookUpSelectList->GetName()) + { + doubleclick = true; + } // Double click + // OK Button - if (widgetName == pLookUpOkBtn->GetName()) + if (widgetName == pLookUpOkBtn->GetName() || doubleclick) { if (pLookUpSelectList->GetSelection() != -1) { @@ -472,6 +489,7 @@ void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event) wxStrcpy (ListDB_Selection2,wxT("")); Close(); } // Cancel Button + } }; // ClookUpDlg::OnCommand