fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 8da38efc0ae6c0ccebcbdebb0dca578539d9ee1f..efb338192a3c8bec48a065c072c70e31dda5857d 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -245,21 +245,34 @@ enum wxDataViewColumnFlags
     wxDATAVIEW_COL_HIDDEN     = 4
 };
 
     wxDATAVIEW_COL_HIDDEN     = 4
 };
 

+enum wxDataViewColumnSizing
+{
+    wxDATAVIEW_COL_WIDTH_FIXED,
+    wxDATAVIEW_COL_WIDTH_AUTO,
+    wxDATAVIEW_COL_WIDTH_GROW
+};
+

 class wxDataViewColumnBase: public wxObject
 {
 public:
 class wxDataViewColumnBase: public wxObject
 {
 public:

-    wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags = 0 );
+    wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, 
+        int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );

     ~wxDataViewColumnBase();
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle();
     ~wxDataViewColumnBase();
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle();

-
+    

     wxDataViewCell* GetCell()               { return m_cell; }
 
     size_t GetModelColumn()                 { return m_model_column; }
 
     void SetOwner( wxDataViewCtrl *owner )  { m_owner = owner; }
     wxDataViewCtrl *GetOwner()              { return m_owner; }
     wxDataViewCell* GetCell()               { return m_cell; }
 
     size_t GetModelColumn()                 { return m_model_column; }
 
     void SetOwner( wxDataViewCtrl *owner )  { m_owner = owner; }
     wxDataViewCtrl *GetOwner()              { return m_owner; }

+    
+    virtual int GetWidth() = 0;
+    
+    virtual void SetFixedWidth( int width ) = 0;
+    virtual int GetFixedWidth() = 0;

 
 private:
     wxDataViewCtrl          *m_ctrl;
 
 private:
     wxDataViewCtrl          *m_ctrl;