Test using wxString::ToCDouble() in wxAny.

[wxWidgets.git] / include / wx / gtk1 / spinctrl.h

diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index e51437430cb6f17038853a7046a616c1e763a7a3..e1fb0b8cd6b92dccb2a8c2e58311a639e4124ef3 100644 (file)
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinctrl.h
+// Name:        wx/gtk1/spinctrl.h

 // Purpose:     wxSpinCtrl class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxSpinCtrl class
 // Author:      Robert Roebling
 // Modified by:


@@ -11,10 +11,6 @@
 #ifndef __GTKSPINCTRLH__
 #define __GTKSPINCTRLH__
 
 #ifndef __GTKSPINCTRLH__
 #define __GTKSPINCTRLH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_SPINCTRL
 #include "wx/defs.h"
 
 #if wxUSE_SPINCTRL


@@ -25,7 +21,7 @@
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 

-class wxSpinCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl

 {
 public:
     wxSpinCtrl() {}
 {
 public:
     wxSpinCtrl() {}


@@ -36,7 +32,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,

-               const wxString& name = _T("wxSpinCtrl"))
+               const wxString& name = wxT("wxSpinCtrl"))

     {
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
     {
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }


@@ -48,9 +44,10 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,

-                const wxString& name = _T("wxSpinCtrl"));
+                const wxString& name = wxT("wxSpinCtrl"));

 
     void SetValue(const wxString& text);
 
     void SetValue(const wxString& text);

+    void SetSelection(long from, long to);

 
     virtual int GetValue() const;
     virtual void SetValue( int value );
 
     virtual int GetValue() const;
     virtual void SetValue( int value );


@@ -58,21 +55,38 @@ public:
     virtual int GetMin() const;
     virtual int GetMax() const;
 
     virtual int GetMin() const;
     virtual int GetMax() const;
 

+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

     // implementation
     // implementation

-    // --------------
-    

     void OnChar( wxKeyEvent &event );
     void OnChar( wxKeyEvent &event );

-    
+

     bool IsOwnGtkWindow( GdkWindow *window );
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();
+    void GtkDisableEvents();
+    void GtkEnableEvents();

 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 
 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 

-protected:
+    virtual int GetBase() const { return m_base; }
+    virtual bool SetBase(int base);
+
+ protected:

     virtual wxSize DoGetBestSize() const;
 
     virtual wxSize DoGetBestSize() const;
 

+    // Widgets that use the style->base colour for the BG colour should
+    // override this and return true.
+    virtual bool UseGTKStyleBase() const { return true; }
+

 private:
 private:

+    // Common part of all ctors.
+    void Init()
+    {
+        m_base = 10;
+    }
+
+    int m_base;
+

     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
 };