Added conversion of menu labels (&->~)

[wxWidgets.git] / samples / db / dbtest.h

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index 7180429f51a04ecd7c5857ec909dff27ad208916..ae5bdc21e648f0ea23c6abb736ac70a037682166 100644 (file)
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -37,7 +37,7 @@ const char      CONTACT_TABLE_NAME[]        =    "contacts";
 const int       CONTACT_NO_COLS            = 12;        // 0-11
 
 // Global structure for holding ODBC connection information
-struct DbStuff  DbConnectInf;
+struct wxDbConnectInf  DbConnectInf;
 
 enum Language {langENGLISH, langFRENCH, langGERMAN, langSPANISH, langOTHER};
 
@@ -307,7 +307,7 @@ char * const langQRY_BETWEEN      = "column BETWEEN value AND value";
 class CqueryDlg : public wxDialog
 {
     private:
-        CcolInf     *colInf;        // Column inf. returned by db->GetColumns()
+        wxColInf    *colInf;        // Column inf. returned by db->GetColumns()
         wxTable     *dbTable;
         char        *masterTableName;
         char        *pWhere;        // A pointer to the storage for the resulting where clause
@@ -346,6 +346,7 @@ class CqueryDlg : public wxDialog
         wxTextCtrl                 *pFocusTxt;
 
         CqueryDlg(wxWindow *parent, wxDB *pDb, char *tblName[], char *pWhereArg);
+        ~CqueryDlg();
 
         void        OnButton( wxCommandEvent &event );
         void        OnCommand(wxWindow& win, wxCommandEvent& event);