this should be the file with the standard setting for wxWin compilation

[wxWidgets.git] / include / wx / msw / slider95.h

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index b54042b1d2f689d94b514232b4771126507bb20b..612c5f5044dc28e5b9b89ce60935a7388502d72d 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _SLIDER95_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _SLIDER95_H_


@@ -28,11 +28,11 @@ class WXDLLEXPORT wxSlider95: public wxControl
 public:
   wxSlider95(void);
 
 public:
   wxSlider95(void);
 

-  inline wxSlider95(wxWindow *parent, const wxWindowID id,
-           const int value, const int minValue, const int maxValue,
+  inline wxSlider95(wxWindow *parent, wxWindowID id,
+           int value, int minValue, int maxValue,

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

-           const long style = wxSL_HORIZONTAL,
+           long style = wxSL_HORIZONTAL,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxSliderNameStr)
   {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxSliderNameStr)
   {


@@ -41,41 +41,50 @@ public:
 
   ~wxSlider95(void);
 
 
   ~wxSlider95(void);
 

-  bool Create(wxWindow *parent, const wxWindowID id,
-           const int value, const int minValue, const int maxValue,
+  bool Create(wxWindow *parent, wxWindowID id,
+           int value, int minValue, int maxValue,

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

-           const long style = wxSL_HORIZONTAL,
+           long style = wxSL_HORIZONTAL,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxSliderNameStr);
 
   virtual int GetValue(void) const ;
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxSliderNameStr);
 
   virtual int GetValue(void) const ;

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

   void GetSize(int *x, int *y) const ;
   void GetSize(int *x, int *y) const ;

-  void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+  wxSize GetSize() const { return wxWindow::GetSize(); }
+
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+

   void GetPosition(int *x, int *y) const ;
   void GetPosition(int *x, int *y) const ;

-  bool Show(const bool show);
+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }

 
 

-  void SetRange(const int minValue, const int maxValue);
+  bool Show(bool show);
+
+  void SetRange(int minValue, int maxValue);

 
   inline int GetMin(void) const { return m_rangeMin; }
   inline int GetMax(void) const { return m_rangeMax; }
 
   // For trackbars only
 
   inline int GetMin(void) const { return m_rangeMin; }
   inline int GetMax(void) const { return m_rangeMax; }
 
   // For trackbars only

-  void SetTickFreq(const int n, const int pos);
+  void SetTickFreq(int n, int pos);

   inline int GetTickFreq(void) const { return m_tickFreq; }
   inline int GetTickFreq(void) const { return m_tickFreq; }

-  void SetPageSize(const int pageSize);
+  void SetPageSize(int pageSize);

   int GetPageSize(void) const ;
   void ClearSel(void) ;
   void ClearTicks(void) ;
   int GetPageSize(void) const ;
   void ClearSel(void) ;
   void ClearTicks(void) ;

-  void SetLineSize(const int lineSize);
+  void SetLineSize(int lineSize);

   int GetLineSize(void) const ;
   int GetSelEnd(void) const ;
   int GetSelStart(void) const ;
   int GetLineSize(void) const ;
   int GetSelEnd(void) const ;
   int GetSelStart(void) const ;

-  void SetSelection(const int minPos, const int maxPos);
-  void SetThumbLength(const int len) ;
+  void SetSelection(int minPos, int maxPos);
+  void SetThumbLength(int len) ;

   int GetThumbLength(void) const ;
   int GetThumbLength(void) const ;

-  void SetTick(const int tickPos) ;
+  void SetTick(int tickPos) ;

 
   // IMPLEMENTATION
   inline WXHWND GetStaticMin() const { return m_staticMin; }
 
   // IMPLEMENTATION
   inline WXHWND GetStaticMin() const { return m_staticMin; }


@@ -83,16 +92,11 @@ public:
   inline WXHWND GetEditValue() const { return m_staticValue; }
   virtual bool ContainsHWND(WXHWND hWnd) const;
 
   inline WXHWND GetEditValue() const { return m_staticValue; }
   virtual bool ContainsHWND(WXHWND hWnd) const;
 

-  // Backward compatibility: translate to familiar wxEVT_COMMAND_SLIDER_UPDATED
-#if WXWIN_COMPATIBILITY
-  void OnScroll(wxScrollEvent& event);
-#endif
-

   void Command(wxCommandEvent& event);
   void Command(wxCommandEvent& event);

-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

-  void MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
-  void MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
+  void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+  void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);

 
  protected:
   WXHWND        m_staticMin;
 
  protected:
   WXHWND        m_staticMin;


@@ -103,7 +107,6 @@ public:
   int           m_pageSize;
   int           m_lineSize;
   int           m_tickFreq;
   int           m_pageSize;
   int           m_lineSize;
   int           m_tickFreq;

-DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif