Wrappers for *ToText

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

diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index a55ccfdcad2149d1dd342afc77823399176e05fa..7be25daf909ddaf065ae5b3790bd46a77d0fa112 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_
 

-#ifdef __GNUG__
+#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"


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

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

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

-class wxDbGridColInfoBase
+class WXDLLIMPEXP_DBGRID wxDbGridColInfoBase

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


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

-class wxDbGridColInfo
+class WXDLLIMPEXP_DBGRID wxDbGridColInfo

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


@@ -78,6 +78,18 @@ public:
     //Recurse to find length.
     int Length() { return (m_next ? m_next->Length() +1 :  1); }
 
     //Recurse to find length.
     int Length() { return (m_next ? m_next->Length() +1 :  1); }
 

+    // Adds a new column info (2 step creation)
+    void AddColInfo (int colNo,
+                    wxString type,
+                    wxString title)
+    {
+        GetLast()->m_next = new wxDbGridColInfo (colNo, type, title, NULL);
+    }
+
+    // Searches last
+    wxDbGridColInfo *GetLast() { return (m_next ? m_next->GetLast() : this); }
+
+

     protected:
     wxDbGridColInfoBase  m_data;
     wxDbGridColInfo     *m_next;
     protected:
     wxDbGridColInfoBase  m_data;
     wxDbGridColInfo     *m_next;


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

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

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


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

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

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


@@ -111,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) ;


@@ -136,7 +148,7 @@ 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 void     ValidateRow(int row);
 
     virtual bool     AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=TRUE);
     virtual void     ValidateRow(int row);


@@ -163,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_