post wxUniv merge fixes

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

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index d6bde8d91ddba5bcb0cdc0d26ff4a934ad5e9812..4e19c5a3db76b957f018269aff90d3ad075768da 100644 (file)
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -22,6 +22,9 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 #define FILE_CREATE           100
 #define FILE_RECREATE_TABLE   110
 #define FILE_RECREATE_INDEXES 120
 #define FILE_CREATE           100
 #define FILE_RECREATE_TABLE   110
 #define FILE_RECREATE_INDEXES 120

+#if wxUSE_NEW_GRID
+#define FILE_DBGRID_TABLE     130
+#endif

 #define FILE_EXIT             199
 #define EDIT_PARAMETERS       200
 #define HELP_ABOUT            300
 #define FILE_EXIT             199
 #define EDIT_PARAMETERS       200
 #define HELP_ABOUT            300


@@ -166,7 +169,10 @@ class DatabaseDemoFrame: public wxFrame
         void    OnExit(wxCommandEvent& event);
         void    OnEditParameters(wxCommandEvent& event);
         void    OnAbout(wxCommandEvent& event);
         void    OnExit(wxCommandEvent& event);
         void    OnEditParameters(wxCommandEvent& event);
         void    OnAbout(wxCommandEvent& event);

-
+#if wxUSE_NEW_GRID
+        void    OnDbGridTable( wxCommandEvent& );
+#endif 
+        void    CreateDataTable(bool recreate);

         void    BuildEditorDialog();
         void    BuildParameterDialog(wxWindow *parent);
 
         void    BuildEditorDialog();
         void    BuildParameterDialog(wxWindow *parent);
 


@@ -174,6 +180,25 @@ DECLARE_EVENT_TABLE()
 };  // DatabaseDemoFrame
 
 
 };  // DatabaseDemoFrame
 
 

+#if wxUSE_NEW_GRID
+
+// *************************** DBGridFrame ***************************
+
+class DbGridFrame : public wxFrame
+{
+public:
+       bool     initialized;
+
+       DbGridFrame(wxWindow *parent);
+
+       void     OnCloseWindow(wxCloseEvent& event);
+       bool     Initialize();
+
+       DECLARE_EVENT_TABLE()
+};
+
+#endif
+

 // Define a new application type
 class DatabaseDemoApp: public wxApp
 {
 // Define a new application type
 class DatabaseDemoApp: public wxApp
 {