moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index 3ec992e78ed1dd99aa3d6f16c8b1c7a6253890be..c7798d15296830467581499481dec4f8b1b4d2fc 100644 (file)
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -1,27 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrollbar.h
 // Purpose:     wxScrollBar class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrollbar.h
 // Purpose:     wxScrollBar class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/15/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

-#ifdef __GNUG__
-#pragma interface "scrolbar.h"
-#endif
-
-#include "wx/control.h"
+#include "wx/scrolbar.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
 
 // Scrollbar item
 
 WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
 
 // Scrollbar item

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

 {
   DECLARE_DYNAMIC_CLASS(wxScrollBar)
 
 {
   DECLARE_DYNAMIC_CLASS(wxScrollBar)
 


@@ -33,7 +29,9 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,

+#if wxUSE_VALIDATORS

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

+#endif

            const wxString& name = wxScrollBarNameStr)
   {
       Create(parent, id, pos, size, style, validator, name);
            const wxString& name = wxScrollBarNameStr)
   {
       Create(parent, id, pos, size, style, validator, name);


@@ -42,7 +40,9 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,

+#if wxUSE_VALIDATORS

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

+#endif

            const wxString& name = wxScrollBarNameStr);
 
   int GetThumbPosition() const ;
            const wxString& name = wxScrollBarNameStr);
 
   int GetThumbPosition() const ;


@@ -54,12 +54,36 @@ public:
   virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh = TRUE);
 
   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);
+#endif
+

   void Command(wxCommandEvent& event);
 
   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
+

 protected:
 protected:

-    int m_pageSize;
-    int m_viewSize;
-    int m_objectSize;
+  int m_pageSize;
+  int m_viewSize;
+  int m_objectSize;

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };