wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

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

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 5c1d103e02225dbe91cb9f68b0847db9f2884270..51befcee29c44c7b280efb910d7924e88f0f147f 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -12,7 +12,7 @@
 #ifndef _SLIDER95_H_
 #define _SLIDER95_H_
 
 #ifndef _SLIDER95_H_
 #define _SLIDER95_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "slider95.h"
 #endif
 
 #pragma interface "slider95.h"
 #endif
 


@@ -46,8 +46,6 @@ public:
     virtual int GetValue() const;
     virtual void SetValue(int);
 
     virtual int GetValue() const;
     virtual void SetValue(int);
 

-    void GetSize(int *w, int *h) const;
-

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


@@ -101,7 +99,9 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 

-    DECLARE_DYNAMIC_CLASS(wxSlider95)
+    virtual wxSize DoGetBestSize() const;
+    
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider95)

 };
 
 #endif
 };
 
 #endif