provide overloads for all kinds of strings for wxDataFormat ctor to allow passing...

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index e575a4f2c087c8e9d46f1d2a261d806667597789..acef40fa2ebcc09b7e639d0483cf70e7521fbefc 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -21,6 +21,7 @@
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
 
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
 

+

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


@@ -28,19 +29,26 @@ class WXDLLIMPEXP_CORE wxDataViewCtrl;
 class wxDataViewRenderer: public wxDataViewRendererBase
 {
 public:
 class wxDataViewRenderer: public wxDataViewRendererBase
 {
 public:

-    wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    wxDataViewRenderer( const wxString &varianttype, 
+                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                        int align = wxDVR_DEFAULT_ALIGNMENT );

 
     // implementation
 
     // implementation

-    void* GetGtkHandle() { return m_renderer; }
+    GtkCellRenderer* GetGtkHandle() { return m_renderer; }
+
+    virtual void SetMode( wxDataViewCellMode mode );
+    virtual wxDataViewCellMode GetMode() const;
+
+    virtual void SetAlignment( int align );
+    virtual int GetAlignment() const;

 
 protected:
 
 protected:

-    // holds the GTK handle
-    void*   m_renderer;
+    GtkCellRenderer   *m_renderer;

 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
 };
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
 };

-    
+

 // --------------------------------------------------------- 
 // wxDataViewTextRenderer
 // --------------------------------------------------------- 
 // --------------------------------------------------------- 
 // wxDataViewTextRenderer
 // --------------------------------------------------------- 


@@ -49,11 +57,14 @@ class wxDataViewTextRenderer: public wxDataViewRenderer
 {
 public:
     wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 
 {
 public:
     wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 

-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                            int align = wxDVR_DEFAULT_ALIGNMENT );

 
     bool SetValue( const wxVariant &value );
 
     bool SetValue( const wxVariant &value );

-    bool GetValue( wxVariant &value );
-    
+    bool GetValue( wxVariant &value ) const;
+
+    void SetAlignment( int align );
+

 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
 };
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
 };


@@ -66,10 +77,11 @@ class wxDataViewBitmapRenderer: public wxDataViewRenderer
 {
 public:
     wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 
 {
 public:
     wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 

-                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                              int align = wxDVR_DEFAULT_ALIGNMENT );

 
     bool SetValue( const wxVariant &value );
 
     bool SetValue( const wxVariant &value );

-    bool GetValue( wxVariant &value );
+    bool GetValue( wxVariant &value ) const;

     
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
     
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)


@@ -83,10 +95,11 @@ class wxDataViewToggleRenderer: public wxDataViewRenderer
 {
 public:
     wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 
 {
 public:
     wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 

-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                              int align = wxDVR_DEFAULT_ALIGNMENT );

 
     bool SetValue( const wxVariant &value );
 
     bool SetValue( const wxVariant &value );

-    bool GetValue( wxVariant &value );
+    bool GetValue( wxVariant &value ) const;

     
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
     
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)


@@ -101,17 +114,18 @@ class wxDataViewCustomRenderer: public wxDataViewRenderer
 public:
     wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
 public:
     wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,

+                              int align = wxDVR_DEFAULT_ALIGNMENT,

                               bool no_init = false );
     virtual ~wxDataViewCustomRenderer();
                               bool no_init = false );
     virtual ~wxDataViewCustomRenderer();

-    bool Init();
-    
+
+

     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;

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

     virtual bool Activate( wxRect cell,
                            wxDataViewListModel *model, unsigned int col, unsigned int row )   
                            { return false; }
     virtual bool Activate( wxRect cell,
                            wxDataViewListModel *model, unsigned int col, unsigned int row )   
                            { return false; }

-    
+

     virtual bool LeftClick( wxPoint cursor, wxRect cell, 
                            wxDataViewListModel *model, unsigned int col, unsigned int row )   
                            { return false; }
     virtual bool LeftClick( wxPoint cursor, wxRect cell, 
                            wxDataViewListModel *model, unsigned int col, unsigned int row )   
                            { return false; }


@@ -125,6 +139,11 @@ public:
     // Create DC on request
     virtual wxDC *GetDC();
     
     // Create DC on request
     virtual wxDC *GetDC();
     

+
+protected:
+
+    bool Init(wxDataViewCellMode mode, int align);
+

 private:
     wxDC        *m_dc;
     
 private:
     wxDC        *m_dc;
     


@@ -141,13 +160,15 @@ class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
 public:
     wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
                                 const wxString &varianttype = wxT("long"), 
 public:
     wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
                                 const wxString &varianttype = wxT("long"), 

-                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+                                int align = wxDVR_DEFAULT_ALIGNMENT );

     virtual ~wxDataViewProgressRenderer();
     
     bool SetValue( const wxVariant &value );
     virtual ~wxDataViewProgressRenderer();
     
     bool SetValue( const wxVariant &value );

+    bool GetValue( wxVariant &value ) const;

     
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     
     virtual bool Render( wxRect cell, wxDC *dc, int state );

-    virtual wxSize GetSize();
+    virtual wxSize GetSize() const;

     
 private:
     wxString    m_label;
     
 private:
     wxString    m_label;


@@ -165,12 +186,14 @@ class wxDataViewDateRenderer: public wxDataViewCustomRenderer
 {
 public:
     wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 
 {
 public:
     wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 

-                        wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE );
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
+                            int align = wxDVR_DEFAULT_ALIGNMENT );

     
     bool SetValue( const wxVariant &value );
     
     bool SetValue( const wxVariant &value );

+    bool GetValue( wxVariant &value ) const;

     
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     
     virtual bool Render( wxRect cell, wxDC *dc, int state );

-    virtual wxSize GetSize();
+    virtual wxSize GetSize() const;

     virtual bool Activate( wxRect cell,
                            wxDataViewListModel *model, unsigned int col, unsigned int row );
     
     virtual bool Activate( wxRect cell,
                            wxDataViewListModel *model, unsigned int col, unsigned int row );
     


@@ -188,12 +211,20 @@ protected:
 class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
 {
 public:
 class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
 {
 public:

-    wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, unsigned int model_column,
-        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
-    wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, unsigned int model_column,
-        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
+                      unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH,
+                      wxAlignment align = wxALIGN_CENTER,
+                      int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer,
+                      unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH,
+                      wxAlignment align = wxALIGN_CENTER,
+                      int flags = wxDATAVIEW_COL_RESIZABLE );
+

     virtual ~wxDataViewColumn();
 
     virtual ~wxDataViewColumn();
 

+
+    // setters:
+

     virtual void SetTitle( const wxString &title );
     virtual void SetBitmap( const wxBitmap &bitmap );
 
     virtual void SetTitle( const wxString &title );
     virtual void SetBitmap( const wxBitmap &bitmap );
 


@@ -202,27 +233,42 @@ public:
     virtual void SetAlignment( wxAlignment align );
     
     virtual void SetSortable( bool sortable );
     virtual void SetAlignment( wxAlignment align );
     
     virtual void SetSortable( bool sortable );

-    virtual bool GetSortable();

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

-    virtual bool IsSortOrderAscending();

 
 

-    virtual int GetWidth();
-    
-    virtual void SetFixedWidth( int width );
-    virtual int GetFixedWidth();
-    
+    virtual void SetResizeable( bool resizeable );
+    virtual void SetHidden( bool hidden );
+
+    virtual void SetMinWidth( int minWidth );
+    virtual void SetWidth( int width );
+
+
+    // getters:
+
+    virtual wxString GetTitle() const;
+    virtual wxAlignment GetAlignment() const;
+
+    virtual bool IsSortable() const;
+    virtual bool IsSortOrderAscending() const;
+    virtual bool IsResizeable() const;
+    virtual bool IsHidden() const;
+
+    virtual int GetWidth() const;
+    virtual int GetMinWidth() const;
+

     // implementation
     // implementation

-    void* GetGtkHandle() { return m_column; }
+    GtkWidget* GetGtkHandle() { return m_column; }

 
 private:
     // holds the GTK handle
 
 private:
     // holds the GTK handle

-    void*   m_column;
+    GtkWidget   *m_column;

     
     // delayed connection to mouse events
     friend class wxDataViewCtrl;
     void OnInternalIdle();
     
     // delayed connection to mouse events
     friend class wxDataViewCtrl;
     void OnInternalIdle();

-    bool    m_isConnected;  
-    
+    bool    m_isConnected;
+
+    void Init(wxAlignment align, int flags, int width);
+

 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };


@@ -271,6 +317,9 @@ public:
     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; }
+    

 private:
     friend class wxDataViewCtrlDC;
     friend class wxDataViewColumn;
 private:
     friend class wxDataViewCtrlDC;
     friend class wxDataViewColumn;


@@ -280,6 +329,9 @@ private:
     
     virtual void OnInternalIdle();
     
     
     virtual void OnInternalIdle();
     

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

 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)