More work on getting wxLisBox events right

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 23e6747392e0e3a2974257d8cbd4c7627adaf0a8..39ab01c92fadd93d178a9ffe983bf579b594b20a 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -479,8 +479,7 @@ public:
     { }
     wxDataViewIconText( const wxDataViewIconText &other )
         : wxObject()
     { }
     wxDataViewIconText( const wxDataViewIconText &other )
         : wxObject()

-        , m_text(other.m_text), m_icon(other.m_icon)
-    { }
+    { m_icon = other.m_icon; m_text = other.m_text; }

 
     void SetText( const wxString &text ) { m_text = text; }
     wxString GetText() const             { return m_text; }
 
     void SetText( const wxString &text ) { m_text = text; }
     wxString GetText() const             { return m_text; }


@@ -586,6 +585,7 @@ protected:
 #define wxDV_VERT_RULES              0x0008     // light vertical rules between columns
 
 #define wxDV_ROW_LINES               0x0010     // alternating colour in rows
 #define wxDV_VERT_RULES              0x0008     // light vertical rules between columns
 
 #define wxDV_ROW_LINES               0x0010     // alternating colour in rows

+#define wxDV_VARIABLE_LINE_HEIGHT    0x0020     // variable line height

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


@@ -698,6 +698,7 @@ public:
 
 
     virtual bool PrependColumn( wxDataViewColumn *col );
 
 
     virtual bool PrependColumn( wxDataViewColumn *col );

+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );

     virtual bool AppendColumn( wxDataViewColumn *col );
 
     virtual unsigned int GetColumnCount() const = 0;
     virtual bool AppendColumn( wxDataViewColumn *col );
 
     virtual unsigned int GetColumnCount() const = 0;


@@ -713,7 +714,7 @@ public:
         { return m_expander_column; }
 
     virtual wxDataViewColumn *GetSortingColumn() const = 0;
         { return m_expander_column; }
 
     virtual wxDataViewColumn *GetSortingColumn() const = 0;

-
+    

     void SetIndent( int indent )
         { m_indent = indent ; DoSetIndent(); }
     int GetIndent() const
     void SetIndent( int indent )
         { m_indent = indent ; DoSetIndent(); }
     int GetIndent() const