Steps towards implementing native-style, non-top-level toolbars on Mac

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 51390f679b625a1c3eea131436f1a7ccf5d19c41..cb8a2d7d3979d95d93b6e2f9b959d84fabf2199a 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -14,151 +14,177 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
+#include "wx/scrolwin.h"
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // classes
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
+class WXDLLIMPEXP_CORE wxDataViewMainWindow;
+class WXDLLIMPEXP_CORE wxDataViewHeaderWindow;
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // wxDataViewCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewCell: public wxDataViewCellBase
 {
 public:
     wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    ~wxDataViewCell();
+
+    virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
+    virtual wxSize GetSize() = 0;
+
+    virtual bool Activate( wxRect WXUNUSED(cell),
+                           wxDataViewListModel *WXUNUSED(model),
+                           size_t WXUNUSED(col),
+                           size_t WXUNUSED(row) )
+                           { return false; }
+
+    virtual bool LeftClick( wxPoint WXUNUSED(cursor),
+                            wxRect WXUNUSED(cell),
+                            wxDataViewListModel *WXUNUSED(model),
+                            size_t WXUNUSED(col),
+                            size_t WXUNUSED(row) )
+                            { return false; }
+    virtual bool RightClick( wxPoint WXUNUSED(cursor),
+                             wxRect WXUNUSED(cell),
+                             wxDataViewListModel *WXUNUSED(model),
+                             size_t WXUNUSED(col),
+                             size_t WXUNUSED(row) )
+                             { return false; }
+    virtual bool StartDrag( wxPoint WXUNUSED(cursor),
+                            wxRect WXUNUSED(cell),
+                            wxDataViewListModel *WXUNUSED(model),
+                            size_t WXUNUSED(col),
+                            size_t WXUNUSED(row) )
+                            { return false; }
+
+    // Create DC on request
+    virtual wxDC *GetDC();
+
+private:
+    wxDC        *m_dc;
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCell)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
+// wxDataViewCustomCell
+// ---------------------------------------------------------
+
+class wxDataViewCustomCell: public wxDataViewCell
+{
+public:
+    wxDataViewCustomCell( const wxString &varianttype = wxT("string"),
+                          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomCell)
+};
+
+// ---------------------------------------------------------
 // wxDataViewTextCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
-class wxDataViewTextCell: public wxDataViewCell
+class wxDataViewTextCell: public wxDataViewCustomCell
 {
 public:
-    wxDataViewTextCell( const wxString &varianttype = wxT("string"), 
+    wxDataViewTextCell( const wxString &varianttype = wxT("string"),
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
-    
+
+    bool Render( wxRect cell, wxDC *dc, int state );
+    wxSize GetSize();
+
+private:
+    wxString m_text;
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextCell)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewToggleCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
-class wxDataViewToggleCell: public wxDataViewCell
+class wxDataViewToggleCell: public wxDataViewCustomCell
 {
 public:
-    wxDataViewToggleCell( const wxString &varianttype = wxT("bool"), 
+    wxDataViewToggleCell( const wxString &varianttype = wxT("bool"),
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     bool SetValue( const wxVariant &value );
     bool GetValue( wxVariant &value );
-    
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleCell)
-};
-    
-// --------------------------------------------------------- 
-// wxDataViewCustomCell
-// --------------------------------------------------------- 
 
-class wxDataViewCustomCell: public wxDataViewCell
-{
-public:
-    wxDataViewCustomCell( const wxString &varianttype = wxT("string"), 
-                          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT )
-    ~wxDataViewCustomCell();
-    bool Init();
-    
-    virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
-    virtual wxSize GetSize() = 0;
-    
-    virtual bool Activate( wxRect cell,
-                           wxDataViewListModel *model, size_t col, size_t row )   
-                           { return false; }
-    
-    virtual bool LeftClick( wxPoint cursor, wxRect cell, 
-                           wxDataViewListModel *model, size_t col, size_t row )   
-                           { return false; }
-    virtual bool RightClick( wxPoint cursor, wxRect cell,
-                           wxDataViewListModel *model, size_t col, size_t row )   
-                           { return false; }
-    virtual bool StartDrag( wxPoint cursor, wxRect cell, 
-                           wxDataViewListModel *model, size_t col, size_t row )   
-                           { return false; }
-    
-    // Create DC on request
-    virtual wxDC *GetDC();
-    
+    bool Render( wxRect cell, wxDC *dc, int state );
+    bool Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row );
+    wxSize GetSize();
+
 private:
-    wxDC        *m_dc;
-    
+    bool    m_toggle;
+
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomCell)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleCell)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewProgressCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewProgressCell: public wxDataViewCustomCell
 {
 public:
-    wxDataViewProgressCell( const wxString &label = wxEmptyString, 
-                            const wxString &varianttype = wxT("long"), 
+    wxDataViewProgressCell( const wxString &label = wxEmptyString,
+                            const wxString &varianttype = wxT("long"),
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
     ~wxDataViewProgressCell();
-    
+
     bool SetValue( const wxVariant &value );
-    
+
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize();
-    
+
 private:
     wxString    m_label;
     int         m_value;
-    
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressCell)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewDateCell
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class wxDataViewDateCell: public wxDataViewCustomCell
 {
 public:
-    wxDataViewDateCell( const wxString &varianttype = wxT("datetime"), 
+    wxDataViewDateCell( const wxString &varianttype = wxT("datetime"),
                         wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE );
-    
+
     bool SetValue( const wxVariant &value );
-    
+
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize();
     virtual bool Activate( wxRect cell,
                            wxDataViewListModel *model, size_t col, size_t row );
-    
+
 private:
     wxDateTime    m_date;
-    
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateCell)
 };
-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------
 // wxDataViewColumn
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
 {
@@ -167,16 +193,20 @@ public:
     virtual ~wxDataViewColumn();
 
     virtual void SetTitle( const wxString &title );
-    
+
+    void SetWidth( int width ) { m_width = width; }
+    int GetWidth() { return m_width; }
+
 private:
+    int     m_width;
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 // wxDataViewCtrl
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase,
                                        public wxScrollHelperNative
@@ -186,12 +216,12 @@ public:
     {
         Init();
     }
-    
+
     wxDataViewCtrl( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator ) :
-           wxScrollHelperNative(this)
+           const wxValidator& validator = wxDefaultValidator )
+             : wxScrollHelperNative(this)
     {
         Create(parent, id, pos, size, style, validator );
     }
@@ -207,14 +237,16 @@ public:
 
     virtual bool AssociateModel( wxDataViewListModel *model );
     virtual bool AppendColumn( wxDataViewColumn *col );
-    
+
 private:
+    friend class wxDataViewMainWindow;
+    friend class wxDataViewHeaderWindow;
     wxDataViewListModelNotifier *m_notifier;
-    wxWindow                    *m_clientArea;
-    wxWindow                    *m_headerArea;
-    
+    wxDataViewMainWindow        *m_clientArea;
+    wxDataViewHeaderWindow      *m_headerArea;
+
 private:
-    virtual void ScrollWindow( int dx, int dy, const wxRect *rect );
+    void OnSize( wxSizeEvent &event );
 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
@@ -223,10 +255,11 @@ private:
 #endif // __WXMSW__
 
     WX_FORWARD_TO_SCROLL_HELPER()
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
+    DECLARE_EVENT_TABLE()
 };