Added compile guards to wxEditableListBox

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 9f2d6f009f15a9705efdff2356eedd22a41f51f5..cb0007521bab2307c2e6c4875b65a2f344116626 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -79,9 +79,9 @@ public:
     virtual wxDC *GetDC();
 
 private:
-    wxDC                *m_dc;
-    int                  m_align;
-    wxDataViewCellMode   m_mode;
+    wxDC                        *m_dc;
+    int                          m_align;
+    wxDataViewCellMode           m_mode;
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
@@ -102,6 +102,7 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };
 
+
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
@@ -119,8 +120,13 @@ public:
     bool Render( wxRect cell, wxDC *dc, int state );
     wxSize GetSize() const;
 
+    // in-place editing
+    virtual bool HasEditorCtrl();
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+        
 private:
-    wxString m_text;
+    wxString   m_text;
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
@@ -291,6 +297,7 @@ private:
     int                      m_flags;
     wxAlignment              m_align;
     wxString                 m_title;
+    bool                     m_ascending;
 
     void Init(int width);
 
@@ -362,6 +369,8 @@ public:     // utility functions not part of the API
     // updates the header window after a change in a column setting
     void OnColumnChange();
 
+    wxWindow *GetMainWindow() { return (wxWindow*) m_clientArea; }
+
 private:
     wxDataViewListModelNotifier *m_notifier;
     wxDataViewMainWindow        *m_clientArea;