removed libxpm dependencies from makefiles

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

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index 59d56bbdf0ccdf1bcc7d7ed750b35e65f879ff5c..754516b048e81008b054bf4fd55209728e4cbf85 100644 (file)
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -14,7 +14,6 @@
 #endif
 
 #include <wx/string.h>
-#include <wx/db.h>
 #include <wx/dbtable.h>
 
 enum    DialogModes {mView,mCreate,mEdit,mSearch};
@@ -39,10 +38,17 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 // Name of the table to be created/opened
 const wxChar     CONTACT_TABLE_NAME[]       = "contacts";
 
+
+#define wxODBC_BLOB_EXPERIMENT 0
+
 // Number of columns in the CONTACT table
+#if wxODBC_BLOB_EXPERIMENT > 0
+const int        CONTACT_NO_COLS            = 13;        // 0-12
+#else
 const int        CONTACT_NO_COLS            = 12;        // 0-11
+#endif
 
-const wxChar     PARAM_FILENAME[]            = "dbtest.cfg";
+const wxChar     PARAM_FILENAME[]           = "dbtest.cfg";
 
 
 enum Language {langENGLISH, langFRENCH, langGERMAN, langSPANISH, langOTHER};
@@ -70,6 +76,9 @@ class CstructContact : public wxObject
         wxChar             Country[20+1];
         TIMESTAMP_STRUCT   JoinDate;            // Date on which this person joined the wxWindows project
         Language           NativeLanguage;      // Enumerated type indicating person's native language
+#if wxODBC_BLOB_EXPERIMENT > 0
+        wxChar             Picture[50000];
+#endif
         bool               IsDeveloper;         // Is this person a developer for wxWindows, or just a subscriber
         UCHAR              Contributions;       // Something to show off an integer field
         ULONG              LinesOfCode;         // Something to show off a 'long' field
@@ -431,7 +440,7 @@ class CqueryDlg : public wxDialog
         wxDbColInf  *colInf;            // Column inf. returned by db->GetColumns()
         wxDbTable   *dbTable;           // generic wxDbTable object for attaching to the table to query
         wxChar      *masterTableName;   // Name of the table that 'dbTable' will be associated with
-        wxChar      *pWhere;            // A pointer to the storage for the resulting where clause
+        wxString     pWhere;            // A pointer to the storage for the resulting where clause
         wxDb        *pDB;
 
     public:
@@ -470,7 +479,7 @@ class CqueryDlg : public wxDialog
 
         wxTextCtrl              *pFocusTxt;
 
-        CqueryDlg(wxWindow *parent, wxDb *pDb, wxChar *tblName[], wxChar *pWhereArg);
+        CqueryDlg(wxWindow *parent, wxDb *pDb, wxChar *tblName[], const wxString &pWhereArg);
         ~CqueryDlg();
 
         void        OnButton( wxCommandEvent &event );