compilation fix for recent commit

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

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 786a823fb897cae853528331df3d455bfa30d3c7..0817377738268e8de2eb3caec631fbb8e33b174a 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -375,6 +375,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 +491,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 +523,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,6 +561,8 @@ 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
 // ----------------------------------------------------------------------------
 // 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


@@ -571,9 +583,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 +665,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()


@@ -1763,9 +1766,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(),