Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index d6bde8d91ddba5bcb0cdc0d26ff4a934ad5e9812..eb5b691081f0829cd0a884f4a23992f9016c2e47 100644 (file)
--- a/samples/db/dbtest.h
+++ b/samples/db/dbtest.h
@@ -9,12 +9,12 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dbtest.h"
 #endif
 
-#include <wx/string.h>
-#include <wx/dbtable.h>
+#include "wx/string.h"
+#include "wx/dbtable.h"
 
 enum    DialogModes {mView,mCreate,mEdit,mSearch};
 
@@ -22,6 +22,9 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 #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
@@ -39,7 +42,7 @@ enum    DialogModes {mView,mCreate,mEdit,mSearch};
 const wxChar     CONTACT_TABLE_NAME[]       = "contacts";
 
 
-#define wxODBC_BLOB_EXPERIMENT 0
+#define wxODBC_BLOB_EXPERIMENT 1
 
 // Number of columns in the CONTACT table
 #if wxODBC_BLOB_EXPERIMENT > 0
@@ -166,7 +169,10 @@ class DatabaseDemoFrame: public wxFrame
         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);
 
@@ -174,6 +180,25 @@ DECLARE_EVENT_TABLE()
 };  // 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
 {