remove unused variables, minor cleanup

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 70dd9145596e2c99bc5721b41b9ee2591d2bf97d..e01b0ece10785da37009885f6e9c5eb9da389630 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -7,208 +7,18 @@
 // 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
-// --------------------------------------------------------- 
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;

 
 

-class WXDLLIMPEXP_CORE wxDataViewCtrl;
-
-
-// --------------------------------------------------------- 
-// wxDataViewRenderer
-// --------------------------------------------------------- 
-
-class wxDataViewRenderer: public wxDataViewRendererBase
-{
-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;
-
-protected:
-    GtkCellRenderer   *m_renderer;
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
-};
-
-// --------------------------------------------------------- 
-// wxDataViewTextRenderer
-// --------------------------------------------------------- 
-
-class wxDataViewTextRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 
-                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                            int align = wxDVR_DEFAULT_ALIGNMENT );
-
-    bool SetValue( const wxVariant &value );
-    bool GetValue( wxVariant &value ) const;
-
-    void SetAlignment( int align );
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
-};
-    
-// --------------------------------------------------------- 
-// wxDataViewBitmapRenderer
-// --------------------------------------------------------- 
-
-class wxDataViewBitmapRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 
-                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                              int align = wxDVR_DEFAULT_ALIGNMENT );
-
-    bool SetValue( const wxVariant &value );
-    bool GetValue( wxVariant &value ) const;
-    
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
-};
-    
-// --------------------------------------------------------- 
-// wxDataViewToggleRenderer
-// --------------------------------------------------------- 
-
-class wxDataViewToggleRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 
-                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                              int align = wxDVR_DEFAULT_ALIGNMENT );
-
-    bool SetValue( const wxVariant &value );
-    bool GetValue( wxVariant &value ) const;
-    
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
-};
-    
-// --------------------------------------------------------- 
-// wxDataViewCustomRenderer
-// --------------------------------------------------------- 
-
-class wxDataViewCustomRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 
-                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                              int align = wxDVR_DEFAULT_ALIGNMENT,
-                              bool no_init = false );
-    virtual ~wxDataViewCustomRenderer();
-
-
-    virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
-    virtual wxSize GetSize() const = 0;
-
-    virtual bool Activate( wxRect cell,
-                           wxDataViewModel *model, const wxDataViewItem &item, unsigned int col )   
-                           { 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 )   
-                           { return false; }
-    virtual bool StartDrag( wxPoint cursor, wxRect cell, 
-                           wxDataViewModel *model, const wxDataViewItem &item, unsigned int col )   
-                           { return false; }
-    
-    // Create DC on request
-    virtual wxDC *GetDC();
-    
-
-protected:
-
-    bool Init(wxDataViewCellMode mode, int align);
-
-private:
-    wxDC        *m_dc;
-    
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
-};
-    
-// --------------------------------------------------------- 
-// wxDataViewProgressRenderer
-// --------------------------------------------------------- 
-
-class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
-{
-public:
-    wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
-                                const wxString &varianttype = wxT("long"), 
-                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                                int align = wxDVR_DEFAULT_ALIGNMENT );
-    virtual ~wxDataViewProgressRenderer();
-    
-    bool SetValue( const wxVariant &value );
-    bool GetValue( wxVariant &value ) const;
-    
-    virtual bool Render( wxRect cell, wxDC *dc, int state );
-    virtual wxSize GetSize() const;
-    
-private:
-    wxString    m_label;
-    int         m_value;
-    
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
-};
-    
-// --------------------------------------------------------- 
-// wxDataViewDateRenderer
-// --------------------------------------------------------- 
-
-class wxDataViewDateRenderer: public wxDataViewCustomRenderer
-{
-public:
-    wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 
-                            wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
-                            int align = wxDVR_DEFAULT_ALIGNMENT );
-    
-    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 Activate( wxRect cell,
-                           wxDataViewModel *model, const wxDataViewItem &item, unsigned int col );
-    
-private:
-    wxDateTime    m_date;
-    
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
-};
-    
-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // 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,


@@ -220,8 +30,6 @@ public:
                       wxAlignment align = wxALIGN_CENTER,
                       int flags = wxDATAVIEW_COL_RESIZABLE );
 
                       wxAlignment align = wxALIGN_CENTER,
                       int flags = wxDATAVIEW_COL_RESIZABLE );
 

-    virtual ~wxDataViewColumn();
-

 
     // setters:
 
 
     // setters:
 


@@ -231,9 +39,10 @@ public:
     virtual void SetOwner( wxDataViewCtrl *owner );
 
     virtual void SetAlignment( wxAlignment align );
     virtual void SetOwner( wxDataViewCtrl *owner );
 
     virtual void SetAlignment( wxAlignment align );

-    
+

     virtual void SetSortable( bool sortable );
     virtual void SetSortOrder( bool ascending );
     virtual void SetSortable( bool sortable );
     virtual void SetSortOrder( bool ascending );

+    virtual void SetAsSortKey(bool sort = true);

 
     virtual void SetResizeable( bool resizeable );
     virtual void SetHidden( bool hidden );
 
     virtual void SetResizeable( bool resizeable );
     virtual void SetHidden( bool hidden );


@@ -241,6 +50,9 @@ 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 );
+
+    virtual void SetFlags(int flags) { SetIndividualFlags(flags); }

 
     // getters:
 
 
     // getters:
 


@@ -249,86 +61,144 @@ public:
 
     virtual bool IsSortable() const;
     virtual bool IsSortOrderAscending() const;
 
     virtual bool IsSortable() const;
     virtual bool IsSortOrderAscending() const;

+    virtual bool IsSortKey() const;
+

     virtual bool IsResizeable() const;
     virtual bool IsHidden() const;
 
     virtual int GetWidth() const;
     virtual int GetMinWidth() const;
 
     virtual bool IsResizeable() const;
     virtual bool IsHidden() const;
 
     virtual int GetWidth() const;
     virtual int GetMinWidth() const;
 

+    virtual bool IsReorderable() const;
+
+    virtual int GetFlags() const { return GetFromIndividualFlags(); }
+

     // 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();
     bool    m_isConnected;
 
     void Init(wxAlignment align, int flags, int width);
     // delayed connection to mouse events
     friend class wxDataViewCtrl;
     void OnInternalIdle();
     bool    m_isConnected;
 
     void Init(wxAlignment align, int flags, int width);

-
-protected:
-    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:
 {
 public:

-    wxDataViewCtrl() 
+    wxDataViewCtrl()

     {
         Init();
     }
     {
         Init();
     }

-    
+

     wxDataViewCtrl( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator )
     {
     wxDataViewCtrl( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator )
     {

+        Init();
+

         Create(parent, id, pos, size, style, validator );
     }
 
         Create(parent, id, pos, size, style, validator );
     }
 

-    virtual ~wxDataViewCtrl();
-
-    void Init();
-

     bool Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator );
 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator );
 

+    virtual ~wxDataViewCtrl();
+

     virtual bool AssociateModel( wxDataViewModel *model );
     virtual bool AssociateModel( wxDataViewModel *model );

+
+    virtual bool PrependColumn( wxDataViewColumn *col );

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

-    
-    // selection code
+    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 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 );
+    virtual bool IsExpanded( const wxDataViewItem & item ) const;
+
+    virtual bool EnableDragSource( const wxDataFormat &format );
+    virtual bool EnableDropTarget( const wxDataFormat &format );

 
     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();
+
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+

 private:
 private:

-    friend class wxDataViewCtrlDC;
+    void Init();
+
+    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;

-    
-    virtual void OnInternalIdle();
-    
+    wxDataViewCtrlInternal  *m_internal;
+    wxDataViewColumnList     m_cols;
+
+    virtual void AddChildGTK(wxWindowGTK* child);

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

-    
-private:
+

     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)

-    DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);

 };
 
 
 };
 
 

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