no need to add . and .. explicitely to the catalogs search path, the new catalog...

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 331c79259b449c50a7106ed8201811d6815e27d8..2e47397f53f715b71bf7b2a4bf193780038b11f2 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -21,6 +21,16 @@
 #include "wx/bitmap.h"
 #include "wx/variant.h"
 
+
+#if defined(__WXGTK20__)
+    // for testing
+    // #define wxUSE_GENERICDATAVIEWCTRL 1
+#elif defined(__WXMAC__)
+    #define wxUSE_GENERICDATAVIEWCTRL 1
+#else
+    #define wxUSE_GENERICDATAVIEWCTRL 1
+#endif
+
 // ----------------------------------------------------------------------------
 // wxDataViewCtrl flags 
 // ----------------------------------------------------------------------------
@@ -209,7 +219,8 @@ public:
     virtual bool GetValue( wxVariant &value )       { return true; }
     virtual bool Validate( wxVariant &value )       { return true; }
     
-    wxString GetVariantType()   { return m_variantType; }
+    wxString GetVariantType()       { return m_variantType; }
+    wxDataViewCellMode GetMode()    { return m_mode; }
     
     void SetOwner( wxDataViewColumn *owner )    { m_owner = owner; }
     wxDataViewColumn* GetOwner()                { return m_owner; }
@@ -293,7 +304,9 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase)
 };
 
-#if defined(__WXGTK20__)
+#if defined(wxUSE_GENERICDATAVIEWCTRL)
+    #include "wx/generic/dataview.h"
+#elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dataview.h"