X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f24badde9a0efe4e2a18057045e044542f582158..002ed9af8309d5baa1b2c32f1fd28160595e2fa7:/include/wx/dbgrid.h diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h index e5c9fa6b08..954655b1c9 100644 --- a/include/wx/dbgrid.h +++ b/include/wx/dbgrid.h @@ -14,12 +14,12 @@ #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 -#if wxUSE_NEW_GRID +#if wxUSE_GRID #include "wx/log.h" #include "wx/dbtable.h" @@ -33,7 +33,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(GenericKey,keyarray); static const int wxUSE_QUERY = -1; -class WXDLLEXPORT wxDbGridColInfoBase +class WXDLLIMPEXP_DBGRID wxDbGridColInfoBase { public: //Default ctor @@ -60,7 +60,7 @@ public: }; -class WXDLLEXPORT wxDbGridColInfo +class WXDLLIMPEXP_DBGRID wxDbGridColInfo { public: wxDbGridColInfo(int colNo, @@ -98,7 +98,7 @@ public: }; -class WXDLLEXPORT wxDbGridCellAttrProvider : public wxGridCellAttrProvider +class WXDLLIMPEXP_DBGRID wxDbGridCellAttrProvider : public wxGridCellAttrProvider { public: wxDbGridCellAttrProvider(); @@ -114,7 +114,7 @@ private: }; -class WXDLLEXPORT wxDbGridTableBase : public wxGridTableBase +class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase { public: wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo, @@ -123,12 +123,12 @@ public: 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) ; @@ -175,7 +175,7 @@ private: bool m_rowmodified; }; -#endif // #if wxUSE_NEW_GRID +#endif // #if wxUSE_GRID #endif // #if wxUSE_ODBC #endif // _WX_GENERIC_DBGRID_H_