added selecting-while-dragging

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

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "dbgrid.h"
 #endif
 
     #pragma interface "dbgrid.h"
 #endif
 


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


@@ -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 WXDLLEXPORT wxDbGridCellAttrProvider : public wxGridCellAttrProvider

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


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

-class wxDbGridTableBase : public wxGridTableBase
+class WXDLLEXPORT wxDbGridTableBase : public wxGridTableBase

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