Sorting fixes to wxUniv wxCombo/ListBox [part of bug #1040593].

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

diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index 3ec992e78ed1dd99aa3d6f16c8b1c7a6253890be..ea0b9119157924f4241364995e1090a645e01fbc 100644 (file)
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -1,68 +1,99 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrollbar.h
 // Purpose:     wxScrollBar class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/15/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
-#ifdef __GNUG__
-#pragma interface "scrolbar.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
+#include "wx/scrolbar.h"
 
 // Scrollbar item
-class WXDLLEXPORT wxScrollBar: public wxControl
+class WXDLLEXPORT wxScrollBar : public wxScrollBarBase
 {
-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
 public:
-  inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
-  ~wxScrollBar();
+    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
+                       ,const wxValidator& rValidator = wxDefaultValidator
+#endif
+                       ,const wxString&    rsName = wxScrollBarNameStr
+                      )
+    {
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,lStyle
+#if wxUSE_VALIDATORS
+               ,rValidator
+#endif
+               ,rsName
+              );
+    }
+    ~wxScrollBar();
 
-  inline wxScrollBar(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           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,
-           long style = wxSB_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr);
+    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
+                ,const wxString&    rsName = 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; }
+                   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 viewStart);
-  virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
-    bool refresh = TRUE);
+           virtual void  SetThumbPosition(int nViewStart);
+           virtual void  SetScrollbar( int  nPosition
+                                      ,int  nThumbSize
+                                      ,int  nRange
+                                      ,int  nPageSize
+                                      ,bool bRefresh = TRUE
+                                     );
 
-  void Command(wxCommandEvent& event);
+                   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_