Order of initializations according to class construction.

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

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index 0550e042b4de67e957363ba9f23e0db5cd0f425b..91ffdf60f0af1c6cba8e8d73e58ed7f2835ad59f 100644 (file)
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        dbtest.h
-// Purpose:     wxWindows database demo app
+// Purpose:     wxWidgets database demo app
 // Author:      George Tasker
 // Modified by:
 // Created:     1998
@@ -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
@@ -82,10 +83,10 @@ class CstructContact : public wxObject
         wxChar             State[25+1];
         wxChar             PostalCode[15+1];
         wxChar             Country[20+1];
-        TIMESTAMP_STRUCT   JoinDate;            // Date on which this person joined the wxWindows project
+        TIMESTAMP_STRUCT   JoinDate;            // Date on which this person joined the wxWidgets project
         Language           NativeLanguage;      // Enumerated type indicating person's native language
         wxChar             Picture[50000];
-        bool               IsDeveloper;         // Is this person a developer for wxWindows, or just a subscriber
+        bool               IsDeveloper;         // Is this person a developer for wxWidgets, or just a subscriber
         UCHAR              Contributions;       // Something to show off an integer field
         ULONG              LinesOfCode;         // Something to show off a 'long' field
 };  // CstructContact
@@ -166,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);
@@ -177,7 +178,7 @@ DECLARE_EVENT_TABLE()
 };  // DatabaseDemoFrame
 
 
-#if wxUSE_NEW_GRID
+#if wxUSE_GRID
 
 // *************************** DBGridFrame ***************************