Removed dummy wxFont == operator implementation (IIRC was needed to compile with...

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 293ff6e141c08bb79160fd4985b975f69c5314e0..28167393b793276638ad9a1427295384fb05b444 100644 (file)
--- 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; }
     GtkCellRenderer* GetGtkHandle() { return m_renderer; }
     void GtkInitHandlers();
     virtual bool GtkHasAttributes() { return false; }

+    void GtkUpdateAlignment();

 
 protected:
     GtkCellRenderer   *m_renderer;
 
 protected:
     GtkCellRenderer   *m_renderer;

+    int                m_alignment;

 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
 
 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 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; }
     virtual bool StartDrag( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), 
                            wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )   
                            { return false; }


@@ -301,6 +300,7 @@ public:
     virtual void SetMinWidth( int minWidth );
     virtual void SetWidth( int width );
 
     virtual void SetMinWidth( int minWidth );
     virtual void SetWidth( int width );
 

+    virtual void SetReorderable( bool reorderable );

 
     // getters:
 
 
     // getters:
 


@@ -314,6 +314,8 @@ public:
 
     virtual int GetWidth() const;
     virtual int GetMinWidth() const;
 
     virtual int GetWidth() const;
     virtual int GetMinWidth() const;

+    
+    virtual bool IsReorderable() const;

 
     // implementation
     GtkWidget* GetGtkHandle() { return m_column; }
 
     // implementation
     GtkWidget* GetGtkHandle() { return m_column; }


@@ -323,6 +325,10 @@ private:
     // holds the GTK handle
     GtkWidget   *m_column;
     
     // 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();
     // delayed connection to mouse events
     friend class wxDataViewCtrl;
     void OnInternalIdle();


@@ -370,6 +376,8 @@ public:
     
     virtual bool PrependColumn( wxDataViewColumn *col );
     virtual bool AppendColumn( wxDataViewColumn *col );
     
     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 );
     virtual unsigned int GetColumnCount() const;
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
     virtual bool DeleteColumn( wxDataViewColumn *column );


@@ -423,6 +431,7 @@ private:
     wxDataViewCtrlInternal  *m_internal;
     wxDataViewColumnList     m_cols;
 
     wxDataViewCtrlInternal  *m_internal;
     wxDataViewColumnList     m_cols;
 

+    virtual void AddChildGTK(wxWindowGTK* child);

     void GtkEnableSelectionEvents();
     void GtkDisableSelectionEvents();
     
     void GtkEnableSelectionEvents();
     void GtkDisableSelectionEvents();