Minor corrections to make dist after reports

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index ab007a505a596f95584fa6e43d99c06052b40bc5..402720cce95a9133c29b727f0fd097649f7966fa 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -7,43 +7,45 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDATAVIEWCTRLH__
-#define __GTKDATAVIEWCTRLH__
+#ifndef _WX_GTKDATAVIEWCTRL_H_
+#define _WX_GTKDATAVIEWCTRL_H_

 
 

-#include "wx/defs.h"
-#include "wx/object.h"

 #include "wx/list.h"
 #include "wx/list.h"

-#include "wx/control.h"

 
 // --------------------------------------------------------- 
 // classes
 // --------------------------------------------------------- 
 
 
 // --------------------------------------------------------- 
 // classes
 // --------------------------------------------------------- 
 

-class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;

 
 
 // --------------------------------------------------------- 
 // wxDataViewRenderer
 // --------------------------------------------------------- 
 
 
 
 // --------------------------------------------------------- 
 // wxDataViewRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewRenderer: public wxDataViewRendererBase
+class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase

 {
 public:
     wxDataViewRenderer( const wxString &varianttype, 
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                         int align = wxDVR_DEFAULT_ALIGNMENT );
 
 {
 public:
     wxDataViewRenderer( const wxString &varianttype, 
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                         int align = wxDVR_DEFAULT_ALIGNMENT );
 

-    // implementation
-    GtkCellRenderer* GetGtkHandle() { return m_renderer; }
-

     virtual void SetMode( wxDataViewCellMode mode );
     virtual wxDataViewCellMode GetMode() const;
 
     virtual void SetAlignment( int align );
     virtual int GetAlignment() const;
 
     virtual void SetMode( wxDataViewCellMode mode );
     virtual wxDataViewCellMode GetMode() const;
 
     virtual void SetAlignment( int align );
     virtual int GetAlignment() const;
 

+    // implementation
+    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)


@@ -53,7 +55,7 @@ protected:
 // wxDataViewTextRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewTextRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewTextRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer

 {
 public:
     wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 
 {
 public:
     wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 


@@ -69,11 +71,29 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
 };
     
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
 };
     

+// --------------------------------------------------------- 
+// wxDataViewTextRendererAttr
+// --------------------------------------------------------- 
+
+class WXDLLIMPEXP_ADV wxDataViewTextRendererAttr: public wxDataViewTextRenderer
+{
+public:
+    wxDataViewTextRendererAttr( const wxString &varianttype = wxT("string"), 
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                            int align = wxDVR_DEFAULT_ALIGNMENT );
+
+    // implementation
+    bool GtkHasAttributes() { return true; }
+    
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRendererAttr)
+};
+    

 // --------------------------------------------------------- 
 // wxDataViewBitmapRenderer
 // --------------------------------------------------------- 
 
 // --------------------------------------------------------- 
 // wxDataViewBitmapRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewBitmapRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer

 {
 public:
     wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 
 {
 public:
     wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 


@@ -91,7 +111,7 @@ protected:
 // wxDataViewToggleRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewToggleRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewToggleRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer

 {
 public:
     wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 
 {
 public:
     wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 


@@ -109,7 +129,7 @@ protected:
 // wxDataViewCustomRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewCustomRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewCustomRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer

 {
 public:
     wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 
 {
 public:
     wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 


@@ -120,20 +140,20 @@ public:
 
 
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
 
 
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;

+    
+    void RenderText( const wxString &text, int xoffset,  wxRect cell, wxDC *dc, int state );
+    

     virtual wxSize GetSize() const = 0;
 
     virtual wxSize GetSize() const = 0;
 

-    virtual bool Activate( wxRect cell,
-                           wxDataViewModel *model, const wxDataViewItem &item, unsigned int col )   
+    virtual bool Activate( wxRect WXUNUSED(cell),
+                           wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )   

                            { return false; }
 
                            { return false; }
 

-    virtual bool LeftClick( wxPoint cursor, wxRect cell, 
-                           wxDataViewModel *model, const wxDataViewItem &item, unsigned int col )   
-                           { return false; }
-    virtual bool RightClick( wxPoint cursor, wxRect cell,
-                           wxDataViewModel *model, const wxDataViewItem &item, unsigned int col )   
+    virtual bool LeftClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), 
+                           wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )   

                            { return false; }
                            { return false; }

-    virtual bool StartDrag( wxPoint cursor, wxRect cell, 
-                           wxDataViewModel *model, const wxDataViewItem &item, unsigned int col )   
+    virtual bool StartDrag( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), 
+                           wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )   

                            { return false; }
     
     // Create DC on request
                            { return false; }
     
     // Create DC on request


@@ -146,7 +166,17 @@ protected:
 
 private:
     wxDC        *m_dc;
 
 private:
     wxDC        *m_dc;

-    
+
+public:    
+    // Internal, temporay for RenderText.
+    GtkCellRenderer      *m_text_renderer;
+    GdkWindow            *window;
+    GtkWidget            *widget;
+    void                 *background_area;
+    void                 *cell_area;
+    void                 *expose_area;
+    int                   flags;
+

 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };


@@ -155,7 +185,7 @@ protected:
 // wxDataViewProgressRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewProgressRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer

 {
 public:
     wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
 {
 public:
     wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 


@@ -178,11 +208,40 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
 };
     
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
 };
     

+// --------------------------------------------------------- 
+// wxDataViewIconTextRenderer
+// --------------------------------------------------------- 
+
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 
+                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                                int align = wxDVR_DEFAULT_ALIGNMENT );
+    virtual ~wxDataViewIconTextRenderer();
+    
+    bool SetValue( const wxVariant &value );
+    bool GetValue( wxVariant &value ) const;
+    
+    virtual bool Render( wxRect cell, wxDC *dc, int state );
+    virtual wxSize GetSize() const;
+    
+    virtual bool HasEditorCtrl() { return true; }
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+    
+private:
+    wxDataViewIconText   m_value;
+    
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
+};
+    

 // --------------------------------------------------------- 
 // wxDataViewDateRenderer
 // --------------------------------------------------------- 
 
 // --------------------------------------------------------- 
 // wxDataViewDateRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewDateRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer

 {
 public:
     wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 
 {
 public:
     wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 


@@ -208,7 +267,7 @@ protected:
 // wxDataViewColumn
 // --------------------------------------------------------- 
 
 // wxDataViewColumn
 // --------------------------------------------------------- 
 

-class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
+class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase

 {
 public:
     wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
 {
 public:
     wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,


@@ -241,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:
 


@@ -254,14 +314,21 @@ 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; }

+    GtkWidget* GetConstGtkHandle() const { return m_column; }

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


@@ -273,11 +340,14 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 

+WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
+                          class WXDLLIMPEXP_ADV);
+

 // --------------------------------------------------------- 
 // wxDataViewCtrl
 // --------------------------------------------------------- 
 
 // --------------------------------------------------------- 
 // wxDataViewCtrl
 // --------------------------------------------------------- 
 

-class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase
+class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase

 {
 public:
     wxDataViewCtrl() 
 {
 public:
     wxDataViewCtrl() 


@@ -303,37 +373,70 @@ public:
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );

+    
+    virtual bool PrependColumn( wxDataViewColumn *col );

     virtual bool AppendColumn( wxDataViewColumn *col );
     virtual bool AppendColumn( wxDataViewColumn *col );

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

     
     

-    // selection code
+    virtual unsigned int GetColumnCount() const;
+    virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
+    virtual bool DeleteColumn( wxDataViewColumn *column );
+    virtual bool ClearColumns();
+    virtual int GetColumnPosition( const wxDataViewColumn *column ) const;
+
+    virtual wxDataViewColumn *GetSortingColumn() const;
+
+    virtual wxDataViewItem GetSelection() const;
+    virtual int GetSelections( wxDataViewItemArray & sel ) const;
+    virtual void SetSelections( const wxDataViewItemArray & sel );
+    virtual void Select( const wxDataViewItem & item );
+    virtual void Unselect( const wxDataViewItem & item );
+    virtual bool IsSelected( const wxDataViewItem & item ) const;
+    virtual void SelectAll();
+    virtual void UnselectAll();
+
+    virtual void EnsureVisible( const wxDataViewItem& item, 
+                                const wxDataViewColumn *column = NULL );
+    virtual void HitTest( const wxPoint &point, 
+                          wxDataViewItem &item, 
+                          wxDataViewColumn *&column ) const;
+    virtual wxRect GetItemRect( const wxDataViewItem &item, 
+                                const wxDataViewColumn *column = NULL ) const;
+
+    virtual void Expand( const wxDataViewItem & item );
+    virtual void Collapse( const wxDataViewItem & item );

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     

-    GtkWidget *GtkGetTreeView() { return m_treeview; }

     wxWindow *GetMainWindow() { return (wxWindow*) this; }
     wxWindow *GetMainWindow() { return (wxWindow*) this; }

+    
+    GtkWidget *GtkGetTreeView() { return m_treeview; }
+    wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; }
+
+    virtual void OnInternalIdle();

 
 protected:
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
 private:
 
 protected:
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
 private:

-    friend class wxDataViewCtrlDC;
+    friend class wxDataViewCtrlDCImpl;

     friend class wxDataViewColumn;
     friend class wxGtkDataViewModelNotifier;
     friend class wxDataViewColumn;
     friend class wxGtkDataViewModelNotifier;

+    friend class wxDataViewCtrlInternal;
+    

     GtkWidget               *m_treeview;
     wxDataViewModelNotifier *m_notifier;
     GtkWidget               *m_treeview;
     wxDataViewModelNotifier *m_notifier;

+    wxDataViewCtrlInternal  *m_internal;
+    wxDataViewColumnList     m_cols;

 
 

-    
-    virtual void OnInternalIdle();
-    

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

-private:

     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
 };
 
 

-#endif // __GTKDATAVIEWCTRLH__
+#endif // _WX_GTKDATAVIEWCTRL_H_