Window management and sizer layout corrections

[wxWidgets.git] / include / wx / univ / scrolbar.h

diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index f43002deb5fd73f6b25cf39ab22354c55a6799bb..e1ec962adf3e5291bb6baa4a833d034ca27313ee 100644 (file)
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -92,13 +92,17 @@ public:
     // wxScrollBar actions
     void ScrollToStart();
     void ScrollToEnd();
     // wxScrollBar actions
     void ScrollToStart();
     void ScrollToEnd();

-    void ScrollLines(int nLines);
-    void ScrollPages(int nPages);
+    bool ScrollLines(int nLines);
+    bool ScrollPages(int nPages);

 
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = 0,
                                const wxString& strArg = wxEmptyString);
 
 
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = 0,
                                const wxString& strArg = wxEmptyString);
 

+    // The scrollbars around a normal window should not
+    // receive the focus.
+    virtual bool AcceptsFocus() const;
+

     // wxScrollBar sub elements state (combination of wxCONTROL_XXX)
     void SetState(Element which, int flags);
     int GetState(Element which) const;
     // wxScrollBar sub elements state (combination of wxCONTROL_XXX)
     void SetState(Element which, int flags);
     int GetState(Element which) const;


@@ -122,6 +126,9 @@ protected:
 
     // event handlers
     void OnIdle(wxIdleEvent& event);
 
     // event handlers
     void OnIdle(wxIdleEvent& event);

+    
+    // forces update of thumb's visual appearence (does nothing if m_dirty=FALSE)
+    void UpdateThumb();

 
     // SetThumbPosition() helper
     void DoSetThumb(int thumbPos);
 
     // SetThumbPosition() helper
     void DoSetThumb(int thumbPos);


@@ -170,12 +177,12 @@ public:
     wxStdScrollBarInputHandler(wxRenderer *renderer,
                                wxInputHandler *inphand);
 
     wxStdScrollBarInputHandler(wxRenderer *renderer,
                                wxInputHandler *inphand);
 

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
                              const wxMouseEvent& event);

-    virtual bool HandleMouseMove(wxControl *control, const wxMouseEvent& event);
+    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);

 
     virtual ~wxStdScrollBarInputHandler();
 
 
     virtual ~wxStdScrollBarInputHandler();