fixed typo in wxString::swap() which was completely broken

[wxWidgets.git] / include / wx / generic / grid.h

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index f599587f6cbe8065d0a01499c03a38cf29a1fc94..8445e3101a3545c3474b6b1bbfbb59a6f54df82a 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -31,6 +31,7 @@
 #include "wx/combobox.h"
 #include "wx/dynarray.h"
 #include "wx/timer.h"
 #include "wx/combobox.h"
 #include "wx/dynarray.h"
 #include "wx/timer.h"

+#include "wx/clntdata.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -98,7 +99,7 @@ class WXDLLEXPORT wxSpinCtrl;
 //     class is not documented and is not public at all
 // ----------------------------------------------------------------------------
 
 //     class is not documented and is not public at all
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellWorker
+class WXDLLEXPORT wxGridCellWorker : public wxClientDataContainer

 {
 public:
     wxGridCellWorker() { m_nRef = 1; }
 {
 public:
     wxGridCellWorker() { m_nRef = 1; }


@@ -375,6 +376,8 @@ protected:
     friend class wxGridCellEditorDummyFriend;
 };
 
     friend class wxGridCellEditorDummyFriend;
 };
 

+#if wxUSE_TEXTCTRL
+

 // the editor for string/text data
 class WXDLLEXPORT wxGridCellTextEditor : public wxGridCellEditor
 {
 // the editor for string/text data
 class WXDLLEXPORT wxGridCellTextEditor : public wxGridCellEditor
 {


@@ -489,6 +492,10 @@ private:
     double m_valueOld;
 };
 
     double m_valueOld;
 };
 

+#endif // wxUSE_TEXTCTRL
+
+#if wxUSE_CHECKBOX
+

 // the editor for boolean data
 class WXDLLEXPORT wxGridCellBoolEditor : public wxGridCellEditor
 {
 // the editor for boolean data
 class WXDLLEXPORT wxGridCellBoolEditor : public wxGridCellEditor
 {


@@ -517,6 +524,10 @@ private:
     bool m_startValue;
 };
 
     bool m_startValue;
 };
 

+#endif // wxUSE_CHECKBOX
+
+#if wxUSE_COMBOBOX
+

 // the editor for string data allowing to choose from the list of strings
 class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor
 {
 // the editor for string data allowing to choose from the list of strings
 class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor
 {


@@ -551,13 +562,15 @@ private:
     bool            m_allowOthers;
 };
 
     bool            m_allowOthers;
 };
 

+#endif // wxUSE_COMBOBOX
+

 // ----------------------------------------------------------------------------
 // wxGridCellAttr: this class can be used to alter the cells appearance in
 // the grid by changing their colour/font/... from default. An object of this
 // class may be returned by wxGridTable::GetAttr().
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxGridCellAttr: this class can be used to alter the cells appearance in
 // the grid by changing their colour/font/... from default. An object of this
 // class may be returned by wxGridTable::GetAttr().
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGridCellAttr
+class WXDLLEXPORT wxGridCellAttr : public wxClientDataContainer

 {
 public:
     enum wxAttrKind
 {
 public:
     enum wxAttrKind


@@ -571,9 +584,10 @@ public:
     };
 
     // ctors
     };
 
     // ctors

-    wxGridCellAttr()
+    wxGridCellAttr(wxGridCellAttr *attrDefault = NULL)

     {
     {

-        Init();
+        Init(attrDefault);
+

         // MB: args used to be 0,0 here but wxALIGN_LEFT is 0
         SetAlignment(-1, -1);
     }
         // MB: args used to be 0,0 here but wxALIGN_LEFT is 0
         SetAlignment(-1, -1);
     }


@@ -652,17 +666,7 @@ private:
     };
 
     // the common part of all ctors
     };
 
     // the common part of all ctors

-    void Init()
-    {
-        m_nRef = 1;
-
-        m_isReadOnly = Unset;
-
-        m_renderer = NULL;
-        m_editor = NULL;
-
-        m_attrkind = wxGridCellAttr::Cell;
-    }
+    void Init(wxGridCellAttr *attrDefault = NULL);

 
     // the dtor is private because only DecRef() can delete us
     ~wxGridCellAttr()
 
     // the dtor is private because only DecRef() can delete us
     ~wxGridCellAttr()


@@ -689,7 +693,7 @@ private:
     wxAttrKind m_attrkind;
 
     // use Clone() instead
     wxAttrKind m_attrkind;
 
     // use Clone() instead

-    DECLARE_NO_COPY_CLASS(wxGridCellAttr);
+    DECLARE_NO_COPY_CLASS(wxGridCellAttr)

 
     // suppress the stupid gcc warning about the class having private dtor and
     // no friends
 
     // suppress the stupid gcc warning about the class having private dtor and
     // no friends


@@ -708,7 +712,7 @@ private:
 // the default implementation is reasonably efficient for the generic case,
 // but you might still wish to implement your own for some specific situations
 // if you have performance problems with the stock one
 // the default implementation is reasonably efficient for the generic case,
 // but you might still wish to implement your own for some specific situations
 // if you have performance problems with the stock one

-class WXDLLEXPORT wxGridCellAttrProvider
+class WXDLLEXPORT wxGridCellAttrProvider : public wxClientDataContainer

 {
 public:
     wxGridCellAttrProvider();
 {
 public:
     wxGridCellAttrProvider();


@@ -742,7 +746,7 @@ private:
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////
 
 

-class WXDLLEXPORT wxGridTableBase : public wxObject
+class WXDLLEXPORT wxGridTableBase : public wxObject, public wxClientDataContainer

 {
 public:
     wxGridTableBase();
 {
 public:
     wxGridTableBase();


@@ -1402,6 +1406,8 @@ public:
     {
         m_extraWidth = extraWidth;
         m_extraHeight = extraHeight;
     {
         m_extraWidth = extraWidth;
         m_extraHeight = extraHeight;

+
+        CalcDimensions();

     }
 
     // Accessors for component windows
     }
 
     // Accessors for component windows


@@ -1763,9 +1769,9 @@ protected:
     bool Redimension( wxGridTableMessage& );
 
 
     bool Redimension( wxGridTableMessage& );
 
 

-    bool SendEvent( const wxEventType, int row, int col, wxMouseEvent& );
-    bool SendEvent( const wxEventType, int row, int col );
-    bool SendEvent( const wxEventType type)
+    int SendEvent( const wxEventType, int row, int col, wxMouseEvent& );
+    int SendEvent( const wxEventType, int row, int col );
+    int SendEvent( const wxEventType type)

     {
         return SendEvent(type,
                          m_currentCellCoords.GetRow(),
     {
         return SendEvent(type,
                          m_currentCellCoords.GetRow(),