Lots of updates for color dialog and sliders

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

diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index 30d9121a7bb07d084f8c607df3c3c92ee9dc6277..f400d4aea8da957c5adfe12be99586089745cc03 100644 (file)
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     20.08.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     20.08.00
 // RCS-ID:      $Id$

-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -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;


@@ -123,12 +127,18 @@ 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);
 
     // common part of all ctors
     void Init();
 
     // SetThumbPosition() helper
     void DoSetThumb(int thumbPos);
 
     // common part of all ctors
     void Init();
 

+    // is this scrollbar attached to a window or a standalone control?
+    bool IsStandalone() const;
+

 private:
     // total range of the scrollbar in logical units
     int m_range;
 private:
     // total range of the scrollbar in logical units
     int m_range;


@@ -170,12 +180,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();