Added windowing and scrolling logic to generic

    implementation of wxDataViewCtrl (it runs now).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index a7b4ea8e778841293ef1ee17de766cd7383bced7..211edc757762c770d19bd775e157ef81800afab9 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -24,7 +24,7 @@
 
 #if defined(__WXGTK20__)
     // for testing
 
 #if defined(__WXGTK20__)
     // for testing

-  //  #define wxUSE_GENERICDATAVIEWCTRL 1
+    // #define wxUSE_GENERICDATAVIEWCTRL 1

 #elif defined(__WXMAC__)
     #define wxUSE_GENERICDATAVIEWCTRL 1
 #else
 #elif defined(__WXMAC__)
     #define wxUSE_GENERICDATAVIEWCTRL 1
 #else

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index c7802da9e7197051a52c8b31e06d60f01937df99..9673737c95638abb468a83be21bceca46e9e8473 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -21,6 +21,8 @@
 // --------------------------------------------------------- 
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
 // --------------------------------------------------------- 
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;

+class WXDLLIMPEXP_CORE wxDataViewMainWindow;
+class WXDLLIMPEXP_CORE wxDataViewHeaderWindow;

 
 // --------------------------------------------------------- 
 // wxDataViewCell
 
 // --------------------------------------------------------- 
 // wxDataViewCell


@@ -169,7 +171,11 @@ public:
 
     virtual void SetTitle( const wxString &title );
     
 
     virtual void SetTitle( const wxString &title );
     

+    void SetWidth( int width ) { m_width = width; }
+    int GetWidth() { return m_width; }
+    

 private:
 private:

+    int     m_width;

 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)


@@ -179,7 +185,7 @@ protected:
 // wxDataViewCtrl
 // --------------------------------------------------------- 
 
 // wxDataViewCtrl
 // --------------------------------------------------------- 
 

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

                                        public wxScrollHelperNative
 {
 public:
                                        public wxScrollHelperNative
 {
 public:


@@ -191,8 +197,8 @@ public:
     wxDataViewCtrl( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
     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 );
     }
     {
         Create(parent, id, pos, size, style, validator );
     }


@@ -210,13 +216,14 @@ public:
     virtual bool AppendColumn( wxDataViewColumn *col );
     
 private:
     virtual bool AppendColumn( wxDataViewColumn *col );
     
 private:

+    friend class wxDataViewMainWindow;

     wxDataViewListModelNotifier *m_notifier;
     wxDataViewListModelNotifier *m_notifier;

-    wxWindow                    *m_clientArea;
-    wxWindow                    *m_headerArea;
+    wxDataViewMainWindow        *m_clientArea;
+    wxDataViewHeaderWindow      *m_headerArea;

     
 private:
     
 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
 #ifdef __WXMSW__
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 #ifdef __WXMSW__


@@ -224,10 +231,11 @@ private:
 #endif // __WXMSW__
 
     WX_FORWARD_TO_SCROLL_HELPER()
 #endif // __WXMSW__
 
     WX_FORWARD_TO_SCROLL_HELPER()

-    
+

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

+    DECLARE_EVENT_TABLE()

 };
 
 
 };
 
 

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 41af9707f1f758a80e4e69d35f67a4d8cf4893cb..63e64dbdd42a578194834bab63452a6a4275cd72 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -381,6 +381,7 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell,
     size_t model_column, int flags ) :
     wxDataViewColumnBase( title, cell, model_column, flags )
 {
     size_t model_column, int flags ) :
     wxDataViewColumnBase( title, cell, model_column, flags )
 {

+    m_width = 80;

 }
 
 wxDataViewColumn::~wxDataViewColumn()
 }
 
 wxDataViewColumn::~wxDataViewColumn()


@@ -436,7 +437,7 @@ wxDataViewHeaderWindow::wxDataViewHeaderWindow( wxDataViewCtrl *parent, wxWindow
     wxWindow( parent, id, pos, size, 0, name )
 {
     SetOwner( parent );
     wxWindow( parent, id, pos, size, 0, name )
 {
     SetOwner( parent );

-    
+

     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
     
     wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();
     m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE );
     
     wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes();


@@ -453,8 +454,10 @@ wxDataViewHeaderWindow::~wxDataViewHeaderWindow()
 
 void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &event )
 {
 
 void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &event )
 {

-    wxPaintDC dc;
-    PrepareDC( dc );
+    int w, h;
+    GetClientSize( &w, &h );
+
+    wxPaintDC dc( this );

     
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );
     
     int xpix;
     m_owner->GetScrollPixelsPerUnit( &xpix, NULL );


@@ -467,7 +470,37 @@ void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &event )
     
     dc.SetFont( GetFont() );
     
     
     dc.SetFont( GetFont() );
     

-    dc.DrawText( wxT("This is the header.."), 5, 5 );
+    size_t cols = GetOwner()->GetNumberOfColumns();
+    size_t i;
+    int xpos = 0;
+    for (i = 0; i < cols; i++)
+    {
+        wxDataViewColumn *col = GetOwner()->GetColumn( i );
+        int width = col->GetWidth();
+        
+        // the width of the rect to draw: make it smaller to fit entirely
+        // inside the column rect
+#ifdef __WXMAC__
+        int cw = width;
+        int ch = h;
+#else
+        int cw = width - 2;
+        int ch = h - 2;
+#endif
+
+        wxRendererNative::Get().DrawHeaderButton
+                                (
+                                    this,
+                                    dc,
+                                    wxRect(xpos, 0, cw, ch),
+                                    m_parent->IsEnabled() ? 0
+                                                          : (int)wxCONTROL_DISABLED
+                                );
+
+        dc.DrawText( col->GetTitle(), xpos+3, 3 );   
+                                
+        xpos += width;
+    }

 }
 
 void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &event )
 }
 
 void wxDataViewHeaderWindow::OnMouse( wxMouseEvent &event )


@@ -500,8 +533,15 @@ public:
     void OnMouse( wxMouseEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     
     void OnMouse( wxMouseEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     

+    void UpdateDisplay();
+    void RecalculateDisplay();
+    void OnInternalIdle();
+    
+    void ScrollWindow( int dx, int dy, const wxRect *rect );

 private:
     wxDataViewCtrl      *m_owner;
 private:
     wxDataViewCtrl      *m_owner;

+    int                  m_lineHeight;
+    bool                 m_dirty;

     
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)
     
 private:
     DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow)


@@ -521,20 +561,70 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     wxWindow( parent, id, pos, size, 0, name )
 {
     SetOwner( parent );
     wxWindow( parent, id, pos, size, 0, name )
 {
     SetOwner( parent );

+    
+    // We need to calculate this smartly..
+    m_lineHeight = 20;
+    
+    UpdateDisplay();

 }
 
 wxDataViewMainWindow::~wxDataViewMainWindow()
 {
 }
 
 }
 
 wxDataViewMainWindow::~wxDataViewMainWindow()
 {
 }
 

+void wxDataViewMainWindow::UpdateDisplay()
+{
+    m_dirty = true;
+}
+
+void wxDataViewMainWindow::OnInternalIdle()
+{
+    wxWindow::OnInternalIdle();
+    
+    if (m_dirty)
+    {
+        RecalculateDisplay();
+        m_dirty = false;
+    }
+}
+
+void wxDataViewMainWindow::RecalculateDisplay()
+{
+    wxDataViewListModel *model = GetOwner()->GetModel();
+    if (!model)
+    {
+        Refresh();
+        return;
+    }
+    
+    int width = 0;
+    size_t cols = GetOwner()->GetNumberOfColumns();
+    size_t i;
+    for (i = 0; i < cols; i++)
+    {
+        wxDataViewColumn *col = GetOwner()->GetColumn( i );
+        width += col->GetWidth();
+    }
+    
+    int height = model->GetNumberOfRows() * m_lineHeight;
+
+    SetVirtualSize( width, height );
+    GetOwner()->SetScrollRate( 10, m_lineHeight );
+    
+    Refresh();
+}
+
+void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
+{
+    wxWindow::ScrollWindow( dx, dy, rect );
+    GetOwner()->m_headerArea->ScrollWindow( dx, 0 );
+}
+

 void wxDataViewMainWindow::OnPaint( wxPaintEvent &event )
 {
     wxPaintDC dc( this );
 
 void wxDataViewMainWindow::OnPaint( wxPaintEvent &event )
 {
     wxPaintDC dc( this );
 

-    PrepareDC( dc );
-
-    int dev_x, dev_y;
-    m_owner->CalcScrolledPosition( 0, 0, &dev_x, &dev_y );
+    GetOwner()->PrepareDC( dc );

 
     dc.SetFont( GetFont() );
     
 
     dc.SetFont( GetFont() );
     


@@ -557,6 +647,10 @@ void wxDataViewMainWindow::OnSetFocus( wxFocusEvent &event )
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase)
 

+BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase)
+    EVT_SIZE(wxDataViewCtrl::OnSize)
+END_EVENT_TABLE()
+

 wxDataViewCtrl::~wxDataViewCtrl()
 {
     if (m_notifier)
 wxDataViewCtrl::~wxDataViewCtrl()
 {
     if (m_notifier)


@@ -572,6 +666,9 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size, 
            long style, const wxValidator& validator )
 {
            const wxPoint& pos, const wxSize& size, 
            long style, const wxValidator& validator )
 {

+    if (!wxControl::Create( parent, id, pos, size, style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator))
+        return false;
+

     Init();
     
 #ifdef __WXMAC__
     Init();
     
 #ifdef __WXMAC__


@@ -610,10 +707,18 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg,
 }
 #endif
 
 }
 #endif
 

-void wxDataViewCtrl::ScrollWindow( int dx, int dy, const wxRect *rect )
+void wxDataViewCtrl::OnSize( wxSizeEvent &event )

 {
 {

-    wxDataViewCtrlBase::ScrollWindow( dx, dy, rect );
-    m_headerArea->ScrollWindow( dx, 0, rect );
+    // We need to override OnSize so that our scrolled
+    // window a) does call Layout() to use sizers for
+    // positioning the controls but b) does not query
+    // the sizer for their size and use that for setting
+    // the scrollable area as set that ourselves by
+    // calling SetScrollbar() further down.
+
+    Layout();
+
+    AdjustScrollbars();

 }
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
 }
 
 bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )


@@ -625,6 +730,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewListModel *model )
 
     model->AddNotifier( m_notifier );    
 
 
     model->AddNotifier( m_notifier );    
 

+    m_clientArea->UpdateDisplay();
+    

     return true;
 }
 
     return true;
 }
 


@@ -632,7 +739,9 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;
 {
     if (!wxDataViewCtrlBase::AppendColumn(col))
         return false;

-        
+    
+    m_clientArea->UpdateDisplay();
+    

     return true;
 }
 
     return true;
 }