compilation fixes for multilib/DLL build

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

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 498221213d5696b04cc26bc89050883027e163a1..5c1d103e02225dbe91cb9f68b0847db9f2884270 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -43,13 +43,14 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxSliderNameStr);
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxSliderNameStr);
 

-    virtual int GetValue() const ;
+    virtual int GetValue() const;

     virtual void SetValue(int);
 
     virtual void SetValue(int);
 

-    void GetSize(int *x, int *y) const ;
-    void GetPosition(int *x, int *y) const ;
+    void GetSize(int *w, int *h) const;

 
 

-    bool Show(bool show);
+    void GetPosition(int *x, int *y) const;
+
+    bool Show(bool show = TRUE);

 
     void SetRange(int minValue, int maxValue);
 
 
     void SetRange(int minValue, int maxValue);
 


@@ -60,17 +61,17 @@ public:
     void SetTickFreq(int n, int pos);
     int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);
     void SetTickFreq(int n, int pos);
     int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);

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

     void SetLineSize(int lineSize);
     void SetLineSize(int lineSize);

-    int GetLineSize() const ;
-    int GetSelEnd() const ;
-    int GetSelStart() const ;
+    int GetLineSize() const;
+    int GetSelEnd() const;
+    int GetSelStart() const;

     void SetSelection(int minPos, int maxPos);
     void SetSelection(int minPos, int maxPos);

-    void SetThumbLength(int len) ;
-    int GetThumbLength() const ;
-    void SetTick(int tickPos) ;
+    void SetThumbLength(int len);
+    int GetThumbLength() const;
+    void SetTick(int tickPos);

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


@@ -94,6 +95,8 @@ protected:
     int           m_lineSize;
     int           m_tickFreq;
 
     int           m_lineSize;
     int           m_tickFreq;
 

+    virtual void DoGetSize(int *width, int *height) const;
+

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);