(blind) compilation fixes after latest changes

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

diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index b3a0d0cdd66493b6e1c82b1c166425ba9ba177f3..898f1dcd1e1f6500326f632a284e3ae1ec68205f 100644 (file)
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -8,55 +8,69 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKSPINCTRLH__
-#define __GTKSPINCTRLH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
+#ifndef _WX_GTK_SPINCTRL_H_
+#define _WX_GTK_SPINCTRL_H_
 
 //-----------------------------------------------------------------------------
-// wxSpinButton
+// wxSpinCtrl
 //-----------------------------------------------------------------------------
 
-class wxSpinCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl
 {
 public:
-    wxSpinCtrl() {}
+    wxSpinCtrl();
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
+               const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = _T("wxSpinCtrl"))
     {
-        Create(parent, id, pos, size, style, min, max, initial, name);
+        Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
 
     bool Create(wxWindow *parent,
                 wxWindowID id = -1,
+                const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxString& name = _T("wxSpinCtrl"));
 
+    void SetValue(const wxString& text);
+    void SetSelection(long from, long to);
+
     virtual int GetValue() const;
     virtual void SetValue( int value );
     virtual void SetRange( int minVal, int maxVal );
     virtual int GetMin() const;
     virtual int GetMax() const;
 
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
+    // implementation
+    void OnChar( wxKeyEvent &event );
+    
+    void GtkDisableEvents();
+    void GtkEnableEvents();
+
+    int m_pos;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
-    GtkAdjustment  *m_adjust;
-    float           m_oldPos;
+    // Widgets that use the style->base colour for the BG colour should
+    // override this and return true.
+    virtual bool UseGTKStyleBase() const { return true; }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
+    DECLARE_EVENT_TABLE()
 };
 
-#endif
-    // __GTKSPINCTRLH__
+#endif // _WX_GTK_SPINCTRL_H_