Fix wx[Sorted]ArrayString::Index when wxUSE_STL=1, because

[wxWidgets.git] / include / wx / dbtable.h

diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
index c23c72370d2c6f7bf756778c1aad8e46ea05dad9..ec15ded2d3472cdc7024288da3f43bd1dfbbd0c9 100644 (file)
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -30,7 +30,7 @@
 
 #include "wx/version.h"
 
 
 #include "wx/version.h"
 

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

   #pragma interface "dbtable.h"
 #endif
 
   #pragma interface "dbtable.h"
 #endif
 


@@ -56,7 +56,7 @@ const int   wxDB_NO_MORE_COLUMN_NUMBERS = -1;
 // wxDbTable class which allows it to create a table in the data
 // source, exchange data between the data source and the C++
 // object, and so on.
 // wxDbTable class which allows it to create a table in the data
 // source, exchange data between the data source and the C++
 // object, and so on.

-class WXDLLEXPORT wxDbColDef
+class WXDLLIMPEXP_BASE wxDbColDef

 {
 public:
     wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];  // Column Name
 {
 public:
     wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];  // Column Name


@@ -77,7 +77,7 @@ public:
 };  // wxDbColDef
 
 
 };  // wxDbColDef
 
 

-class WXDLLEXPORT wxDbColDataPtr
+class WXDLLIMPEXP_BASE wxDbColDataPtr

 {
 public:
     void    *PtrDataObj;
 {
 public:
     void    *PtrDataObj;


@@ -87,7 +87,7 @@ public:
 
 
 // This structure is used when creating secondary indexes.
 
 
 // This structure is used when creating secondary indexes.

-class WXDLLEXPORT wxDbIdxDef
+class WXDLLIMPEXP_BASE wxDbIdxDef

 {
 public:
     wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];
 {
 public:
     wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];


@@ -95,7 +95,7 @@ public:
 };  // wxDbIdxDef
 
 
 };  // wxDbIdxDef
 
 

-class WXDLLEXPORT wxDbTable
+class WXDLLIMPEXP_BASE wxDbTable

 {
 private:
     ULONG       tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors
 {
 private:
     ULONG       tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors


@@ -329,8 +329,8 @@ public:
 //TODO: Need to Document
     typedef     enum  { WX_ROW_MODE_QUERY , WX_ROW_MODE_INDIVIDUAL } rowmode_t;
     virtual     void         SetRowMode(const rowmode_t rowmode);
 //TODO: Need to Document
     typedef     enum  { WX_ROW_MODE_QUERY , WX_ROW_MODE_INDIVIDUAL } rowmode_t;
     virtual     void         SetRowMode(const rowmode_t rowmode);

-    virtual     wxVariant    GetCol(const int Colno) const ;
-    virtual     void         SetCol(const int ColNo, const wxVariant value);
+    virtual     wxVariant    GetCol(const int colNo) const ;
+    virtual     void         SetCol(const int colNo, const wxVariant value);

     virtual     GenericKey   GetKey(void);
     virtual     void         SetKey(const GenericKey &key);
 
     virtual     GenericKey   GetKey(void);
     virtual     void         SetKey(const GenericKey &key);