X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f605ccf3fcce969d9a634bf1cf6aa4f13f74d2e..4bf45c9ecafa14b167ef0c911a83cd5cc8fba4d2:/include/wx/msw/slider95.h

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 9370f27922..51befcee29 100644
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -12,7 +12,7 @@
 #ifndef _SLIDER95_H_
 #define _SLIDER95_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "slider95.h"
 #endif
 
@@ -43,16 +43,12 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxSliderNameStr);
 
-    virtual int GetValue() const ;
+    virtual int GetValue() const;
     virtual void SetValue(int);
 
-    virtual void DoGetSize(int *width, int *height) const;
-
-    void GetSize(int *w, int *h) const;
-
     void GetPosition(int *x, int *y) const;
 
-    bool Show(bool show);
+    bool Show(bool show = TRUE);
 
     void SetRange(int minValue, int maxValue);
 
@@ -63,17 +59,17 @@ public:
     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);
-    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 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; }
@@ -97,11 +93,15 @@ protected:
     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);
 
-    DECLARE_DYNAMIC_CLASS(wxSlider95)
+    virtual wxSize DoGetBestSize() const;
+    
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider95)
 };
 
 #endif