Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index 425f31f3353837d33e85d5260ffbf4f75dd8e90a..0b42fce248c62762d1a07bffbf5741e139d87a15 100644 (file)
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

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


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

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

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


@@ -36,7 +31,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,7 +43,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"));

 
     void SetValue(const wxString& text);
     void SetSelection(long from, long to);
 
     void SetValue(const wxString& text);
     void SetSelection(long from, long to);


@@ -61,19 +56,21 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

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

-    
+

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

-    void ApplyWidgetStyle();

     void GtkDisableEvents();
     void GtkEnableEvents();
 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 
     void GtkDisableEvents();
     void GtkEnableEvents();
 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 

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

     virtual wxSize DoGetBestSize() const;
 
     // Widgets that use the style->base colour for the BG colour should
     virtual wxSize DoGetBestSize() const;
 
     // Widgets that use the style->base colour for the BG colour should


@@ -81,6 +78,14 @@ protected:
     virtual bool UseGTKStyleBase() const { return true; }
 
 private:
     virtual bool UseGTKStyleBase() const { return true; }
 
 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()
 };