Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index 7be44ed401ee3f6f814cff0eabaef2ad46e2601f..d8688818e69a66d1f722e1e28839e97fe7adfbf1 100644 (file)
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        scrollbar.h
+// Name:        wx/os2/scrolbar.h
 // Purpose:     wxScrollBar class
 // Author:      David Webster
 // Modified by:
 // Created:     10/15/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,89 +11,88 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
+#include "wx/scrolbar.h"
 
 // Scrollbar item
-class WXDLLEXPORT wxScrollBar: public wxControl
+class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase
 {
-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
 public:
-  inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
-  ~wxScrollBar();
-
-  inline wxScrollBar(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxSB_HORIZONTAL,
+    inline wxScrollBar()
+    {
+        m_nPageSize = 0;
+        m_nViewSize = 0;
+        m_nObjectSize = 0;
+    }
+    inline wxScrollBar( wxWindow*          pParent
+                       ,wxWindowID         vId
+                       ,const wxPoint&     rPos = wxDefaultPosition
+                       ,const wxSize&      rSize = wxDefaultSize
+                       ,long               lStyle = wxSB_HORIZONTAL
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
+                       ,const wxValidator& rValidator = wxDefaultValidator
 #endif
-           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,
-           long style = wxSB_HORIZONTAL,
+                       ,const wxString&    rsName = wxScrollBarNameStr
+                      )
+    {
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,lStyle
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
+               ,rValidator
 #endif
-           const wxString& name = wxScrollBarNameStr);
-
-  int GetThumbPosition() const ;
-  inline int GetThumbSize() const { return m_pageSize; }
-  inline int GetPageSize() const { return m_viewSize; }
-  inline int GetRange() const { return m_objectSize; }
-
-  virtual void SetThumbPosition(int viewStart);
-  virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
-    bool refresh = TRUE);
-
-#if WXWIN_COMPATIBILITY
-  // Backward compatibility
-  int GetValue() const { return GetThumbPosition(); }
-  void SetValue(int viewStart) { SetThumbPosition(viewStart); }
-  void GetValues(int *viewStart, int *viewLength, int *objectLength,
-          int *pageLength) const ;
-  int GetViewLength() const { return m_viewSize; }
-  int GetObjectLength() const { return m_objectSize; }
-
-  void SetPageSize(int pageLength);
-  void SetObjectLength(int objectLength);
-  void SetViewLength(int viewLength);
+               ,rsName
+              );
+    }
+    virtual ~wxScrollBar();
+
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = wxSB_HORIZONTAL
+#if wxUSE_VALIDATORS
+                ,const wxValidator& rValidator = wxDefaultValidator
 #endif
-
-  void Command(wxCommandEvent& event);
-
-  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-          WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-  virtual bool OS2OnScroll(int orientation, WXWORD wParam,
-                           WXWORD pos, WXHWND control);
-
-#if WXWIN_COMPATIBILITY
-  // Backward compatibility: generate an old-style scroll command
-  void OnScroll(wxScrollEvent& event);
-#endif // WXWIN_COMPATIBILITY
+                ,const wxString&    rsName = wxScrollBarNameStr
+               );
+
+                   int   GetThumbPosition(void) const ;
+    inline         int   GetThumbSize(void) const { return m_nPageSize; }
+    inline         int   GetPageSize(void) const { return m_nViewSize; }
+    inline         int   GetRange(void) const { return m_nObjectSize; }
+
+           virtual void  SetThumbPosition(int nViewStart);
+           virtual void  SetScrollbar( int  nPosition
+                                      ,int  nThumbSize
+                                      ,int  nRange
+                                      ,int  nPageSize
+                                      ,bool bRefresh = TRUE
+                                     );
+
+                   void      Command(wxCommandEvent& rEvent);
+            virtual WXHBRUSH OnCtlColor( WXHDC    hDC
+                                        ,WXHWND   hWnd
+                                        ,WXUINT   uCtlColor
+                                        ,WXUINT   uMessage
+                                        ,WXWPARAM wParam
+                                        ,WXLPARAM lParam
+                                       );
+            virtual bool     OS2OnScroll( int    nOrientation
+                                         ,WXWORD wParam
+                                         ,WXWORD wPos
+                                         ,WXHWND hControl
+                                        );
 
 protected:
-  int m_pageSize;
-  int m_viewSize;
-  int m_objectSize;
+    int                             m_nPageSize;
+    int                             m_nViewSize;
+    int                             m_nObjectSize;
 
-DECLARE_EVENT_TABLE()
-};
+private:
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+}; // end of CLASS wxScrollBar
 
 #endif
     // _WX_SCROLBAR_H_