X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99c75ebc5e447e1bb25439e22f07130583dc5783..f9bb777f88b5c93054e0ba0c2f1d5d9186f97a33:/include/wx/gtk/dataview.h?ds=sidebyside

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index d20ee24a77..28167393b7 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -41,9 +41,11 @@ public:
     GtkCellRenderer* GetGtkHandle() { return m_renderer; }
     void GtkInitHandlers();
     virtual bool GtkHasAttributes() { return false; }
+    void GtkUpdateAlignment();
 
 protected:
     GtkCellRenderer   *m_renderer;
+    int                m_alignment;
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
@@ -150,9 +152,6 @@ public:
     virtual bool LeftClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), 
                            wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )   
                            { return false; }
-    virtual bool RightClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
-                           wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )   
-                           { return false; }
     virtual bool StartDrag( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), 
                            wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )   
                            { return false; }
@@ -326,6 +325,10 @@ private:
     // holds the GTK handle
     GtkWidget   *m_column;
     
+    // holds GTK handles for title/bitmap in the header
+    GtkWidget   *m_image;
+    GtkWidget   *m_label;
+    
     // delayed connection to mouse events
     friend class wxDataViewCtrl;
     void OnInternalIdle();
@@ -373,6 +376,8 @@ public:
     
     virtual bool PrependColumn( wxDataViewColumn *col );
     virtual bool AppendColumn( wxDataViewColumn *col );
+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );
+    
     virtual unsigned int GetColumnCount() const;
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
     virtual bool DeleteColumn( wxDataViewColumn *column );
@@ -426,6 +431,7 @@ private:
     wxDataViewCtrlInternal  *m_internal;
     wxDataViewColumnList     m_cols;
 
+    virtual void AddChildGTK(wxWindowGTK* child);
     void GtkEnableSelectionEvents();
     void GtkDisableSelectionEvents();