fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...

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

diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp
index fb68ff5be09602cf84eab783922a329b2923f00d..f60902a4e626ac6bea3f97a2e19ac829e8662cbf 100644 (file)
--- a/samples/db/listdb.cpp
+++ b/samples/db/listdb.cpp
@@ -135,7 +135,7 @@ Clookup::Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &de
                defDir)
 {
 
                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()
 
 
 }  // Clookup()
 


@@ -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 (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 (++i, colName2, DB_DATA_TYPE_VARCHAR, lookupCol2, SQL_C_CHAR, LOOKUP_COL_LEN+1, FALSE, FALSE);

 
 }  // Clookup2()
 
 
 }  // Clookup2()
 


@@ -177,7 +177,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     wxBeginBusyCursor();
     
     wxStrcpy(ListDB_Selection,wxT(""));
     wxBeginBusyCursor();
     
     wxStrcpy(ListDB_Selection,wxT(""));

-    widgetPtrsSet = false;
+    widgetPtrsSet = FALSE;

     lookup  = 0;
     lookup2 = 0;
     noDisplayCols = 1;
     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"));
 
     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);
 
     // Query the lookup table and display the result set
         lookup = new Clookup(tableName, colName, pDb, defDir);


@@ -224,12 +224,12 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     pLookUpSelectList->SetSelection(0);
 
     // Make the OK activate by pressing Enter
     pLookUpSelectList->SetSelection(0);
 
     // Make the OK activate by pressing Enter

-    if (pLookUpSelectList->Number())
+    if (pLookUpSelectList->GetCount())

         pLookUpOkBtn->SetDefault();
     else
     {
         pLookUpCancelBtn->SetDefault();
         pLookUpOkBtn->SetDefault();
     else
     {
         pLookUpCancelBtn->SetDefault();

-        pLookUpOkBtn->Enable(false);
+        pLookUpOkBtn->Enable(FALSE);

     }
 
     // Display the dialog window
     }
 
     // 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
 //
 //    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.
 // 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.


@@ -275,7 +275,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     
     wxStrcpy(ListDB_Selection,wxT(""));
     wxStrcpy(ListDB_Selection2,wxT(""));
     
     wxStrcpy(ListDB_Selection,wxT(""));
     wxStrcpy(ListDB_Selection2,wxT(""));

-    widgetPtrsSet = false;
+    widgetPtrsSet = FALSE;

     lookup  = 0;
     lookup2 = 0;
     noDisplayCols = (wxStrlen(dispCol2) ? 2 : 1);
     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"));
 
     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);
 
     // 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);
     {
         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();
         {
             wxMessageBox(wxT("ODBC error during Query()"),wxT("ODBC Error..."));
             Close();


@@ -384,12 +384,12 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
     pLookUpSelectList->SetSelection(0);
 
     // Make the OK activate by pressing Enter
     pLookUpSelectList->SetSelection(0);
 
     // Make the OK activate by pressing Enter

-    if (pLookUpSelectList->Number())
+    if (pLookUpSelectList->GetCount())

         pLookUpOkBtn->SetDefault();
     else
     {
         pLookUpCancelBtn->SetDefault();
         pLookUpOkBtn->SetDefault();
     else
     {
         pLookUpCancelBtn->SetDefault();

-        pLookUpOkBtn->Enable(false);
+        pLookUpOkBtn->Enable(FALSE);

     }
 
     pLookUpOkBtn->Enable(allowOk);
     }
 
     pLookUpOkBtn->Enable(allowOk);


@@ -405,8 +405,8 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName,
 
 void ClookUpDlg::OnClose(wxCloseEvent& event)
 {
 
 void ClookUpDlg::OnClose(wxCloseEvent& event)
 {

-    widgetPtrsSet = false;
-    GetParent()->Enable(true);
+    widgetPtrsSet = FALSE;
+    GetParent()->Enable(TRUE);

 
     if (lookup)
         delete lookup;
 
     if (lookup)
         delete lookup;


@@ -418,7 +418,7 @@ void ClookUpDlg::OnClose(wxCloseEvent& event)
     while (wxIsBusy()) wxEndBusyCursor();
     event.Skip();
 
     while (wxIsBusy()) wxEndBusyCursor();
     event.Skip();
 

-//    return true;
+//    return TRUE;

 
 }  // ClookUpDlg::OnClose
 
 
 }  // ClookUpDlg::OnClose