put grid string in generic/grid.cpp, not common/datacmn.cpp

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 5e37624e0fe2da61eeec30059ea4f565f98ff464..947e81690fcb2caaac7e59d6f184c4c335838d69 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -24,7 +24,7 @@
 
 #if defined(__WXGTK20__)
     // for testing
-//    #define wxUSE_GENERICDATAVIEWCTRL 1
+    #define wxUSE_GENERICDATAVIEWCTRL 1
 #elif defined(__WXMAC__)
     #define wxUSE_GENERICDATAVIEWCTRL 1
 #else
@@ -253,18 +253,11 @@ enum wxDataViewColumnFlags
     wxDATAVIEW_COL_HIDDEN     = 4
 };
 
-enum wxDataViewColumnSizing
-{
-    wxDATAVIEW_COL_WIDTH_FIXED,
-    wxDATAVIEW_COL_WIDTH_AUTO,
-    wxDATAVIEW_COL_WIDTH_GROW
-};
-
 class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
 {
 public:
     wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column,
-        int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
+        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
     virtual ~wxDataViewColumnBase();
 
     virtual void SetTitle( const wxString &title );
@@ -279,9 +272,6 @@ public:
 
     virtual int GetWidth() = 0;
 
-    virtual void SetFixedWidth( int width ) = 0;
-    virtual int GetFixedWidth() = 0;
-
 private:
     wxDataViewCtrl          *m_ctrl;
     wxDataViewCell          *m_cell;