-1->wxID_ANY, TRUE->true and FALSE->false replacements.

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

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index 4f8e032e5e7d2f4b8290c9d4c41fa5f0d372d4f9..9abe3346f2af5b2ac1b718d191fc5c574f0c9d89 100644 (file)
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -22,7 +22,8 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 #define FILE_CREATE_ID        100
 #define FILE_RECREATE_TABLE   110
 #define FILE_RECREATE_INDEXES 120
-#if wxUSE_NEW_GRID
+
+#if wxUSE_GRID
 #define FILE_DBGRID_TABLE     130
 #endif
 #define FILE_EXIT             199
@@ -41,14 +42,13 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 // Name of the table to be created/opened
 const wxChar     CONTACT_TABLE_NAME[]       = wxT("contacts");
 
-
-#define wxODBC_BLOB_EXPERIMENT 1
+#define wxODBC_BLOB_SUPPORT
 
 // Number of columns in the CONTACT table
-#if wxODBC_BLOB_EXPERIMENT > 0
-const int        CONTACT_NO_COLS            = 13;        // 0-12
+#ifdef wxODBC_BLOB_SUPPORT
+    const int        CONTACT_NO_COLS            = 13;        // 0-12
 #else
-const int        CONTACT_NO_COLS            = 12;        // 0-11
+    const int        CONTACT_NO_COLS            = 12;        // 0-11
 #endif
 
 const wxChar     PARAM_FILENAME[]           = wxT("dbtest.cfg");
@@ -85,9 +85,7 @@ 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
@@ -169,7 +167,7 @@ class DatabaseDemoFrame: public wxFrame
         void    OnExit(wxCommandEvent& event);
         void    OnEditParameters(wxCommandEvent& event);
         void    OnAbout(wxCommandEvent& event);
-#if wxUSE_NEW_GRID
+#if wxUSE_GRID
         void    OnDbGridTable( wxCommandEvent& );
 #endif 
         void    CreateDataTable(bool recreate);
@@ -180,7 +178,7 @@ DECLARE_EVENT_TABLE()
 };  // DatabaseDemoFrame
 
 
-#if wxUSE_NEW_GRID
+#if wxUSE_GRID
 
 // *************************** DBGridFrame ***************************