allow to specify the value for unknown ids in GetXRCID() (patch 1448981)

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index efb338192a3c8bec48a065c072c70e31dda5857d..f6756133b1b54cd9d692299832008c1f72a4bd6c 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -255,22 +255,22 @@ enum wxDataViewColumnSizing
 class wxDataViewColumnBase: public wxObject
 {
 public:
 class wxDataViewColumnBase: public wxObject
 {
 public:

-    wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, 
+    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();
         int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
     ~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 int GetWidth() = 0;

-    
+

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


@@ -290,6 +290,9 @@ protected:
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 

+#define wxDV_SINGLE                  0x0000     // for convenience
+#define wxDV_MULTIPLE                0x0020     // can select multiple items
+

 class wxDataViewCtrlBase: public wxControl
 {
 public:
 class wxDataViewCtrlBase: public wxControl
 {
 public:


@@ -322,7 +325,8 @@ protected:
 #elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/dataview.h"
+    // TODO
+    // #include "wx/mac/dataview.h"

 #else
     #include "wx/generic/dataview.h"
 #endif
 #else
     #include "wx/generic/dataview.h"
 #endif