#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 */
* NOTE: The value returned by this function is for temporary use only and
* should be copied for long term use
*/
-const wxChar *GetExtendedDBErrorMsg2(wxChar *ErrFile, int ErrLine)
+const wxChar *GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *ErrFile, int ErrLine)
{
static wxString msg;
- msg.Empty();
+ msg = wxT("");
wxString tStr;
msg += ErrFile;
msg += wxT(" Line: ");
tStr.Printf(wxT("%d"),ErrLine);
- msg += tStr;
+ msg += tStr.c_str();
msg += wxT("\n");
}
msg.Append (wxT("\nODBC errors:\n"));
msg += wxT("\n");
- /* Scan through each database connection displaying
- * any ODBC errors that have occured. */
- wxDbList *pDbList;
- for (pDbList = PtrBegDbList; pDbList; pDbList = pDbList->PtrNext)
+ // Display errors for this connection
+ int i;
+ for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
{
- // Skip over any free connections
- if (pDbList->Free)
- continue;
- // Display errors for this connection
- for (int i = 0; i < DB_MAX_ERROR_HISTORY; i++)
+ if (pDb->errorList[i])
{
- if (pDbList->PtrDb->errorList[i])
- {
- msg.Append(pDbList->PtrDb->errorList[i]);
- if (wxStrcmp(pDbList->PtrDb->errorList[i],wxT("")) != 0)
- msg.Append(wxT("\n"));
- // Clear the errmsg buffer so the next error will not
- // end up showing the previous error that have occurred
- wxStrcpy(pDbList->PtrDb->errorList[i],wxT(""));
- }
+ msg.Append(pDb->errorList[i]);
+ if (wxStrcmp(pDb->errorList[i],wxT("")) != 0)
+ msg.Append(wxT("\n"));
+ // Clear the errmsg buffer so the next error will not
+ // end up showing the previous error that have occurred
+ wxStrcpy(pDb->errorList[i],wxT(""));
}
}
msg += wxT("\n");
- return /*(wxChar*) (const wxChar*) msg*/msg.c_str();
+ return msg.c_str();
} // GetExtendedDBErrorMsg
-
// Clookup constructor
Clookup::Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir)
: wxDbTable(pDb, tblName, 1, wxT(""), !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()
int i = 0;
- SetColDefs (i, colName1, DB_DATA_TYPE_VARCHAR, lookupCol1, SQL_C_CHAR, LOOKUP_COL_LEN+1, FALSE, FALSE);
+ SetColDefs (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 (++i, colName2, DB_DATA_TYPE_VARCHAR, lookupCol2, SQL_C_CHAR, LOOKUP_COL_LEN+1, false, false);
} // Clookup2()
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;
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
- if (!(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..."));
Close();
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();
- pLookUpOkBtn->Enable(FALSE);
+ pLookUpOkBtn->Enable(false);
}
// Display the dialog window
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();
wxStrcpy(ListDB_Selection,wxT(""));
wxStrcpy(ListDB_Selection2,wxT(""));
- widgetPtrsSet = FALSE;
+ widgetPtrsSet = false;
lookup = 0;
lookup2 = 0;
noDisplayCols = (wxStrlen(dispCol2) ? 2 : 1);
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
- if (!(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..."));
Close();
{
wxString tStr;
tStr.Printf(wxT("Unable to open the table '%s'."),tableName);
- tStr += GetExtendedDBErrorMsg2(__FILE__,__LINE__);
+ tStr += GetExtendedDBErrorMsg2(pDb,__TFILE__,__LINE__);
wxMessageBox(tStr,wxT("ODBC Error..."));
Close();
return;
return;
}
if (lookup2->GetNext())
- maxColLen = col1Len = atoi(lookup2->lookupCol1);
+ maxColLen = col1Len = wxAtoi(lookup2->lookupCol1);
else
wxMessageBox(wxT("ODBC error during GetNext()"),wxT("ODBC Error..."));
}
{
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();
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();
- pLookUpOkBtn->Enable(FALSE);
+ pLookUpOkBtn->Enable(false);
}
pLookUpOkBtn->Enable(allowOk);
void ClookUpDlg::OnClose(wxCloseEvent& event)
{
- widgetPtrsSet = FALSE;
- GetParent()->Enable(TRUE);
+ widgetPtrsSet = false;
+ GetParent()->Enable(true);
if (lookup)
delete lookup;
while (wxIsBusy()) wxEndBusyCursor();
event.Skip();
-// return TRUE;
+// return true;
} // ClookUpDlg::OnClose
}
-void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& event)
+void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
{
wxString widgetName = win.GetName();
projects / wxWidgets.git / blobdiff