Use gtk_init_check instead of gtk_init so that we can racefully exit

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

diff --git a/samples/db/listdb.h b/samples/db/listdb.h
index 070a0982e2528ce42e3b051d4519d07acdce9c86..866ea8a5dfde9e3353e94cd6a0af81f7c2e71957 100644 (file)
--- a/samples/db/listdb.h
+++ b/samples/db/listdb.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "listdb.h"
 #endif
 
 #pragma interface "listdb.h"
 #endif
 


@@ -21,7 +21,7 @@
 #define LISTDB_DOT_H
 
 
 #define LISTDB_DOT_H
 
 

-#include <wx/dbtable.h>
+#include "wx/dbtable.h"

 
 const int LOOKUP_COL_LEN = 250;
 
 
 const int LOOKUP_COL_LEN = 250;
 


@@ -32,7 +32,7 @@ class Clookup : public wxDbTable
 
         wxChar lookupCol[LOOKUP_COL_LEN+1];
 
 
         wxChar lookupCol[LOOKUP_COL_LEN+1];
 

-        Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir="");
+        Clookup(wxChar *tblName, wxChar *colName, wxDb *pDb, const wxString &defDir=wxT(""));

 
 };  // Clookup
 
 
 };  // Clookup
 


@@ -45,7 +45,7 @@ class Clookup2 : public wxDbTable
         wxChar lookupCol1[LOOKUP_COL_LEN+1];
         wxChar lookupCol2[LOOKUP_COL_LEN+1];
 
         wxChar lookupCol1[LOOKUP_COL_LEN+1];
         wxChar lookupCol2[LOOKUP_COL_LEN+1];
 

-        Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb, const wxString &defDir="");
+        Clookup2(wxChar *tblName, wxChar *colName1, wxChar *colName2, wxDb *pDb, const wxString &defDir=wxT(""));

 
 };  // Clookup2
 
 
 };  // Clookup2