This file should not have been checked in!

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

diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index e5c9fa6b08a55b6386f33fe2f56fcd473afad94e..954655b1c9e37e100b7a6088bb906f4c3749ee43 100644 (file)
--- a/include/wx/dbgrid.h
+++ b/include/wx/dbgrid.h
@@ -14,12 +14,12 @@
 #ifndef _WX_GENERIC_DBGRID_H_
 #define _WX_GENERIC_DBGRID_H_
 
 #ifndef _WX_GENERIC_DBGRID_H_
 #define _WX_GENERIC_DBGRID_H_
 

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

     #pragma interface "dbgrid.h"
 #endif
 
 #if wxUSE_ODBC
     #pragma interface "dbgrid.h"
 #endif
 
 #if wxUSE_ODBC

-#if wxUSE_NEW_GRID
+#if wxUSE_GRID

 
 #include "wx/log.h"
 #include "wx/dbtable.h"
 
 #include "wx/log.h"
 #include "wx/dbtable.h"


@@ -33,7 +33,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray);
 
 static const int wxUSE_QUERY = -1;
 
 
 static const int wxUSE_QUERY = -1;
 

-class WXDLLEXPORT wxDbGridColInfoBase
+class WXDLLIMPEXP_DBGRID wxDbGridColInfoBase

 {
 public:
     //Default ctor
 {
 public:
     //Default ctor


@@ -60,7 +60,7 @@ public:
 };
 
 
 };
 
 

-class WXDLLEXPORT wxDbGridColInfo
+class WXDLLIMPEXP_DBGRID wxDbGridColInfo

 {
 public:
     wxDbGridColInfo(int colNo,
 {
 public:
     wxDbGridColInfo(int colNo,


@@ -98,7 +98,7 @@ public:
 };
 
 
 };
 
 

-class WXDLLEXPORT wxDbGridCellAttrProvider : public wxGridCellAttrProvider
+class WXDLLIMPEXP_DBGRID wxDbGridCellAttrProvider : public wxGridCellAttrProvider

 {
 public:
     wxDbGridCellAttrProvider();
 {
 public:
     wxDbGridCellAttrProvider();


@@ -114,7 +114,7 @@ private:
 };
 
 
 };
 
 

-class WXDLLEXPORT wxDbGridTableBase : public wxGridTableBase
+class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase

 {
 public:
     wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,
 {
 public:
     wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,


@@ -123,12 +123,12 @@ public:
 
     virtual int GetNumberRows()
     {
 
     virtual int GetNumberRows()
     {

-        wxLogDebug(" GetNumberRows() = %i",m_rowtotal);
+        wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal);

         return m_rowtotal;
     }
     virtual int GetNumberCols()
     {
         return m_rowtotal;
     }
     virtual int GetNumberCols()
     {

-        wxLogDebug(" GetNumberCols() = %i",m_nocols);
+        wxLogDebug(_T(" GetNumberCols() = %i"),m_nocols);

         return m_nocols;
     }
     virtual bool     IsEmptyCell(int row, int col) ;
         return m_nocols;
     }
     virtual bool     IsEmptyCell(int row, int col) ;


@@ -175,7 +175,7 @@ private:
     bool         m_rowmodified;
 };
 
     bool         m_rowmodified;
 };
 

-#endif  // #if wxUSE_NEW_GRID
+#endif  // #if wxUSE_GRID

 #endif  // #if wxUSE_ODBC
 
 #endif  // _WX_GENERIC_DBGRID_H_
 #endif  // #if wxUSE_ODBC
 
 #endif  // _WX_GENERIC_DBGRID_H_