Fixed bug #1163384. Moved the code that handles activating the cell

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

diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index 758e3cb18ad32e20307341983aba1cdd111694b3..5a8dd5cbc23ce6b1b8f042f6cc4b8a3e0ea0247f 100644 (file)
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -2,23 +2,20 @@
 // Name:        scrolbar.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        scrolbar.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSCROLLBARH__
 #define __GTKSCROLLBARH__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "scrolbar.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/object.h"
-#include "wx/control.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -26,56 +23,67 @@
 
 class wxScrollBar;
 
 
 class wxScrollBar;
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxScrollBarNameStr;
-

 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 

-class wxScrollBar: public wxControl
+class wxScrollBar: public wxScrollBarBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
-  public:
-  
-    wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; };
-    wxScrollBar(wxWindow *parent, const wxWindowID id,
+public:
+    wxScrollBar()
+       { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; }
+    inline wxScrollBar( wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxSB_HORIZONTAL,
-           const wxString& name = wxScrollBarNameStr );
-    ~wxScrollBar(void);
-    bool Create(wxWindow *parent, const wxWindowID id,
+           long style = wxSB_HORIZONTAL,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxScrollBarNameStr )
+    {
+        Create( parent, id, pos, size, style, validator, name );
+    }
+    bool Create( wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxSB_HORIZONTAL,
-           const wxString& name = wxScrollBarNameStr);
-    int GetPosition(void) const;
+           long style = wxSB_HORIZONTAL,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxScrollBarNameStr );
+    ~wxScrollBar();
+    int GetThumbPosition() const;

     int GetThumbSize() const;
     int GetPageSize() const;
     int GetRange() const;
     int GetThumbSize() const;
     int GetPageSize() const;
     int GetRange() const;

-    virtual void SetPosition( const int viewStart );
-    virtual void SetScrollbar( const int position, const int thumbSize, const int range, const int pageSize,
-      const bool refresh = TRUE );
+    virtual void SetThumbPosition( int viewStart );
+    virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
+      bool refresh = TRUE );

 
     // Backward compatibility
 
     // Backward compatibility

+    // ----------------------
+

     int GetValue(void) const;
     int GetValue(void) const;

-    void SetValue( const int viewStart );
+    void SetValue( int viewStart );

     void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
     int GetViewLength() const;
     int GetObjectLength() const;
     void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const;
     int GetViewLength() const;
     int GetObjectLength() const;

-    void SetPageSize( const int pageLength );
-    void SetObjectLength( const int objectLength );
-    void SetViewLength( const int viewLength );
-      
-  public:
-  
+    void SetPageSize( int pageLength );
+    void SetObjectLength( int objectLength );
+    void SetViewLength( int viewLength );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
+    // implementation
+    // --------------
+
+    bool IsOwnGtkWindow( GdkWindow *window );
+

     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     GtkAdjustment  *m_adjust;
     float           m_oldPos;

+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)

 };
 
 #endif
 };
 
 #endif