renamed GetColHeader() to GetGridColHeader() for consistency with the other existing...

[wxWidgets.git] / include / wx / scrolwin.h

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 570922a169f3455417dd9b1990b5fcd4dc631dd9..0ba4976501307350640ab18159f178bb114d2027 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -208,6 +208,33 @@ protected:
     // in wxScrollHelperEvtHandler::ProcessEvent()
     void ResetDrawnFlag();
 
     // in wxScrollHelperEvtHandler::ProcessEvent()
     void ResetDrawnFlag();
 

+    // helper of AdjustScrollbars(): does the work for the single scrollbar
+    //
+    // notice that the parameters passed by non-const references are modified
+    // by this function
+    void AdjustScrollbar(int orient,
+                         int clientSize,
+                         int virtSize,
+                         int& pixelsPerUnit,
+                         int& scrollUnits,
+                         int& scrollPosition);
+
+    // this function should be overridden to return the size available for
+    // m_targetWindow inside m_win of the given size
+    //
+    // the default implementation is only good for m_targetWindow == m_win
+    // case, if we're scrolling a subwindow you must override this method
+    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size)
+    {
+        // returning just size from here is wrong but it was decided that it is
+        // not wrong enough to break the existing code (which doesn't override
+        // this recently added function at all) by adding this assert
+        //
+        // wxASSERT_MSG( m_targetWindow == m_win, "must be overridden" );
+
+        return size;
+    }
+

 
     double                m_scaleX;
     double                m_scaleY;
 
     double                m_scaleX;
     double                m_scaleY;


@@ -237,6 +264,7 @@ protected:
 
     wxScrollHelperEvtHandler *m_handler;
 
 
     wxScrollHelperEvtHandler *m_handler;
 

+

     DECLARE_NO_COPY_CLASS(wxScrollHelper)
 };
 
     DECLARE_NO_COPY_CLASS(wxScrollHelper)
 };
 


@@ -306,7 +334,7 @@ public:
         m_targetWindow = this;
 
 #ifdef __WXMAC__
         m_targetWindow = this;
 
 #ifdef __WXMAC__

-        MacSetClipChildren(true);
+        this->MacSetClipChildren(true);

 #endif
 
         this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxScrolled::OnPaint));
 #endif
 
         this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxScrolled::OnPaint));


@@ -348,7 +376,11 @@ private:
         event.Skip();
     }
 
         event.Skip();
     }
 

+    // VC++ 6 gives warning for the declaration of template member function
+    // without definition
+#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)

     DECLARE_NO_COPY_CLASS(wxScrolled)
     DECLARE_NO_COPY_CLASS(wxScrolled)

+#endif

 };
 
 // VC++ <= 6 requires this; it's unlikely any other specializations would
 };
 
 // VC++ <= 6 requires this; it's unlikely any other specializations would