compilation fix for !WXWIN_COMPATIBILITY_2_2

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

diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index 8b6bf5d49aca18f654728fbf7e0793098725600a..8919c86c6420d648c9e94339569b82843c23f9c3 100644 (file)
--- a/include/wx/dbgrid.h
+++ b/include/wx/dbgrid.h
@@ -29,11 +29,11 @@
 
 #define wxGRID_VALUE_DBAUTO     _T("dbauto")
 
 
 #define wxGRID_VALUE_DBAUTO     _T("dbauto")
 

-WX_DECLARE_OBJARRAY(GenericKey,keyarray);
+WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray);

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

-class wxDbGridColInfoBase
+class WXDLLEXPORT wxDbGridColInfoBase

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


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

-class wxDbGridColInfo
+class WXDLLEXPORT wxDbGridColInfo

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


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

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

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


@@ -102,11 +102,11 @@ private:
 };
 
 
 };
 
 

-class wxDbGridTableBase : public wxGridTableBase
+class WXDLLEXPORT 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()


@@ -136,14 +136,14 @@ public:
     virtual void     SetValueAsCustom(int row, int col, const wxString& typeName, void* value);
 
 
     virtual void     SetValueAsCustom(int row, int col, const wxString& typeName, void* value);
 
 

-    virtual wxString wxDbGridTableBase::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();
     }