wxMax instead of max, former is always around

[wxWidgets.git] / samples / db / listdb.cpp

diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp
index 0801df5c87d56e1399444126a5934c3e36eb5f38..5cfbc84f79d02ad2c99074ba1836086b0193aeb2 100644 (file)
--- 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
     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
      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.
      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.
 
     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.
      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
 */
 
 // SYNOPSIS STOP
 */
 


@@ -108,7 +108,7 @@ const wxChar *GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *ErrFile, int ErrLine)
 
     msg.Append (wxT("\nODBC errors:\n"));
     msg += wxT("\n");
 
     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++)
     // Display errors for this connection
     int i;
     for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)


@@ -131,7 +131,7 @@ const wxChar *GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *ErrFile, int ErrLine)
 
 // Clookup constructor
 Clookup::Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir)
 
 // 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)
 {
 
                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)
 // 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);
                !wxDB_QUERY_ONLY, defDir)
 {
     wxASSERT(pDb);


@@ -153,10 +153,10 @@ Clookup2::Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2,
 
     int i = 0;
 
 
     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)
 
     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()
 
 
 }  // Clookup2()
 


@@ -175,7 +175,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
    : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxDefaultPosition, wxSize(400, 290))
 {
     wxBeginBusyCursor();
    : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxDefaultPosition, wxSize(400, 290))
 {
     wxBeginBusyCursor();

-    
+

     wxStrcpy(ListDB_Selection,wxT(""));
     widgetPtrsSet = false;
     lookup  = 0;
     wxStrcpy(ListDB_Selection,wxT(""));
     widgetPtrsSet = false;
     lookup  = 0;


@@ -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.
 //
 // 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
 // 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,
 //
 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..."), wxDefaultPosition, wxSize(400, 290))
 {
     wxBeginBusyCursor();
                        wxChar *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;
     wxStrcpy(ListDB_Selection,wxT(""));
     wxStrcpy(ListDB_Selection2,wxT(""));
     widgetPtrsSet = false;