Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index d13878293c6386e726362b69efdc253be08a38ad..c057b4b1165a54117e816ed58d75088588035e51 100644 (file)
--- a/include/wx/dbgrid.h
+++ b/include/wx/dbgrid.h
@@ -14,7 +14,7 @@
 #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
 
     #pragma interface "dbgrid.h"
 #endif
 


@@ -29,7 +29,7 @@
 
 #define wxGRID_VALUE_DBAUTO     _T("dbauto")
 
 
 #define wxGRID_VALUE_DBAUTO     _T("dbauto")
 

-WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray);
+WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID);

 
 static const int wxUSE_QUERY = -1;
 
 
 static const int wxUSE_QUERY = -1;
 


@@ -118,17 +118,17 @@ class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase
 {
 public:
     wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,
 {
 public:
     wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,

-              int count = wxUSE_QUERY, bool takeOwnership = TRUE);
+              int count = wxUSE_QUERY, bool takeOwnership = true);

     ~wxDbGridTableBase();
 
     virtual int GetNumberRows()
     {
     ~wxDbGridTableBase();
 
     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) ;


@@ -150,12 +150,12 @@ public:
 
     virtual wxString GetColLabelValue(int col);
 
 
     virtual wxString GetColLabelValue(int col);
 

-    virtual bool     AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=TRUE);
+    virtual bool     AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=true);

     virtual void     ValidateRow(int row);
     virtual bool     UpdateRow(int row) const
     {
         if (m_row != row)
     virtual void     ValidateRow(int row);
     virtual bool     UpdateRow(int row) const
     {
         if (m_row != row)

-            return TRUE;
+            return true;

         else
             return Writeback();
     }
         else
             return Writeback();
     }