X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd74a7ad6787f028629ba32211ebf1e2aeb34dbd..991d57f8443fc8a31c2ad3e3a8180af08a6394d6:/include/wx/dbgrid.h?ds=inline diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h index dd10c6c39b..901af313c3 100644 --- a/include/wx/dbgrid.h +++ b/include/wx/dbgrid.h @@ -14,10 +14,6 @@ #ifndef _WX_GENERIC_DBGRID_H_ #define _WX_GENERIC_DBGRID_H_ -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "dbgrid.h" -#endif - #if wxUSE_ODBC #if wxUSE_GRID @@ -29,11 +25,11 @@ #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; -class WXDLLEXPORT wxDbGridColInfoBase +class WXDLLIMPEXP_DBGRID wxDbGridColInfoBase { public: //Default ctor @@ -60,7 +56,7 @@ public: }; -class WXDLLEXPORT wxDbGridColInfo +class WXDLLIMPEXP_DBGRID wxDbGridColInfo { public: wxDbGridColInfo(int colNo, @@ -98,7 +94,7 @@ public: }; -class WXDLLEXPORT wxDbGridCellAttrProvider : public wxGridCellAttrProvider +class WXDLLIMPEXP_DBGRID wxDbGridCellAttrProvider : public wxGridCellAttrProvider { public: wxDbGridCellAttrProvider(); @@ -114,21 +110,21 @@ private: }; -class WXDLLEXPORT wxDbGridTableBase : public wxGridTableBase +class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase { public: wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, - int count = wxUSE_QUERY, bool takeOwnership = TRUE); + int count = wxUSE_QUERY, bool takeOwnership = true); ~wxDbGridTableBase(); virtual int GetNumberRows() { - wxLogDebug(" GetNumberRows() = %i",m_rowtotal); + wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal); 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) ; @@ -150,12 +146,12 @@ public: 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) - return TRUE; + return true; else return Writeback(); }