Patch #808669 more warngins and unicode fixes

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

diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
index 4e19c5a3db76b957f018269aff90d3ad075768da..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};
 
@@ -42,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
@@ -187,14 +187,14 @@ DECLARE_EVENT_TABLE()
 class DbGridFrame : public wxFrame
 {
 public:
-       bool     initialized;
+    bool     initialized;
 
-       DbGridFrame(wxWindow *parent);
+    DbGridFrame(wxWindow *parent);
 
-       void     OnCloseWindow(wxCloseEvent& event);
-       bool     Initialize();
+    void     OnCloseWindow(wxCloseEvent& event);
+    bool     Initialize();
 
-       DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 #endif