Corrected copyright message

[wxWidgets.git] / include / wx / generic / spinctlg.h

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 973af21a18bbba66b3e7fb2d33647b8855689038..d6d9a4043bc28645c51f3383e418a4fe04a65387 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -20,9 +20,9 @@
 // without tons of #ifdefs.
 // ----------------------------------------------------------------------------
 
 // without tons of #ifdefs.
 // ----------------------------------------------------------------------------
 

-#if wxUSE_SPINBTN 
+#if wxUSE_SPINBTN

 
 

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

     #pragma interface "spinctlg.h"
 #endif
 
     #pragma interface "spinctlg.h"
 #endif
 


@@ -66,6 +66,7 @@ public:
     void SetValue(int val);
     void SetValue(const wxString& text);
     void SetRange(int min, int max);
     void SetValue(int val);
     void SetValue(const wxString& text);
     void SetRange(int min, int max);

+    void SetSelection(long from, long to);

 
     // accessors
     int GetValue() const;
 
     // accessors
     int GetValue() const;


@@ -92,7 +93,7 @@ public:
 
 protected:
     // override the base class virtuals involved into geometry calculations
 
 protected:
     // override the base class virtuals involved into geometry calculations

-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;

     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // common part of all ctors
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // common part of all ctors


@@ -102,7 +103,7 @@ private:
     // the subcontrols
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;
     // the subcontrols
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };