use struct timeval and not a long to store socket timeout under Unix too

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index eecad6d6eb83b17c3d64a758fdaab52ebe4ce37b..a10ee6606baaf2d99e24b500537c28a9f7e087bf 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -41,10 +41,8 @@ public:
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() const = 0;
 
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
     virtual wxSize GetSize() const = 0;
 

-    virtual void SetAlignment( int align )
-        { m_align=align; }
-    virtual int GetAlignment() const
-        { return m_align; }
+    virtual void SetAlignment( int align );
+    virtual int GetAlignment() const;

 
     virtual void SetMode( wxDataViewCellMode mode )
         { m_mode=mode; }
 
     virtual void SetMode( wxDataViewCellMode mode )
         { m_mode=mode; }


@@ -83,6 +81,9 @@ public:
     void SetAttr( const wxDataViewItemAttr &attr ) { m_attr = attr; }
     bool GetWantsAttr() { return m_wantsAttr; }
 
     void SetAttr( const wxDataViewItemAttr &attr ) { m_attr = attr; }
     bool GetWantsAttr() { return m_wantsAttr; }
 

+    // implementation
+    int CalculateAlignment() const;
+

 private:
     wxDC                        *m_dc;
     int                          m_align;
 private:
     wxDC                        *m_dc;
     int                          m_align;


@@ -243,7 +244,7 @@ protected:
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 

-class wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer

 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 
 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 


@@ -388,8 +389,6 @@ class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,
 public:
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {
 public:
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {

-        //No sorting column at start, I think
-        m_sortingColumn = NULL;

         Init();
     }
 
         Init();
     }
 


@@ -399,7 +398,6 @@ public:
            const wxValidator& validator = wxDefaultValidator )
              : wxScrollHelperNative(this)
     {
            const wxValidator& validator = wxDefaultValidator )
              : wxScrollHelperNative(this)
     {

-        m_sortingColumn = NULL;

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


@@ -413,8 +411,10 @@ public:
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );

+    

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

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

 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();


@@ -444,6 +444,8 @@ public:
 
     virtual void Expand( const wxDataViewItem & item );
     virtual void Collapse( const wxDataViewItem & item );
 
     virtual void Expand( const wxDataViewItem & item );
     virtual void Collapse( const wxDataViewItem & item );

+    
+    virtual void SetFocus();

 
 protected:
     virtual int GetSelections( wxArrayInt & sel ) const; 
 
 protected:
     virtual int GetSelections( wxArrayInt & sel ) const; 


@@ -487,6 +489,7 @@ private:
 
 private:
     void OnSize( wxSizeEvent &event );
 
 private:
     void OnSize( wxSizeEvent &event );

+    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);

 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through