[ 1494561 ] wxComboCtrl vertical size fix.

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

diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index 1fa6b82982ee8dcf9db587876ae1ae028612913a..426a01f4b07818051554c390f8a92c299b097457 100644 (file)
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -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,10 +21,10 @@
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxSpinCtrl() {}
+    wxSpinCtrl();

     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
                const wxString& value = wxEmptyString,
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
                const wxString& value = wxEmptyString,


@@ -51,6 +47,7 @@ public:
                 const wxString& name = _T("wxSpinCtrl"));
 
     void SetValue(const wxString& text);
                 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 int GetValue() const;
     virtual void SetValue( int value );


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

-    // implementation
-    // --------------
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

     
     

+    // implementation

     void OnChar( wxKeyEvent &event );
     
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnChar( wxKeyEvent &event );
     
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();
+    void GtkDisableEvents();
+    void GtkEnableEvents();
+
+    int m_pos;
+
+protected:
+    virtual wxSize DoGetBestSize() 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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)