X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e565667d0f29605c948ad6e742310798e3b2d0d..38ececd4c399ade4c47ca424eb72dbbd5dda528e:/include/wx/generic/spinctlg.h?ds=sidebyside

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 61c38b6a56..a35cc8a4a4 100644
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.10.99
-// RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,6 +21,8 @@
 
 #if wxUSE_SPINBTN
 
+#include "wx/compositewin.h"
+
 class WXDLLIMPEXP_FWD_CORE wxSpinButton;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
@@ -40,7 +41,8 @@ class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase
 // function ambiguity.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxSpinCtrlBase
+class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase
+                : public wxNavigationEnabled<wxCompositeWindow<wxSpinCtrlBase> >
 {
 public:
     wxSpinCtrlGenericBase() { Init(); }
@@ -85,6 +87,8 @@ public:
     virtual void DoSetToolTip(wxToolTip *tip);
 #endif // wxUSE_TOOLTIPS
 
+    virtual bool SetBackgroundColour(const wxColour& colour);
+
     // get the subcontrols
     wxTextCtrl   *GetText() const       { return m_textCtrl; }
     wxSpinButton *GetSpinButton() const { return m_spinButton; }
@@ -105,6 +109,7 @@ public:
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 #ifdef __WXMSW__
@@ -112,9 +117,15 @@ protected:
     virtual void DoEnable(bool enable);
 #endif // __WXMSW__
 
+    enum SendEvent
+    {
+        SendEvent_None,
+        SendEvent_Text
+    };
+
     // generic double valued functions
     double DoGetValue() const { return m_value; }
-    bool DoSetValue(double val);
+    bool DoSetValue(double val, SendEvent sendEvent);
     void DoSetRange(double min_val, double max_val);
     void DoSetIncrement(double inc);
 
@@ -124,7 +135,7 @@ protected:
     // can also change the text control if its value is invalid
     //
     // return true if our value has changed
-    bool SyncSpinToText();
+    bool SyncSpinToText(SendEvent sendEvent);
 
     // Send the correct event type
     virtual void DoSendEvent() = 0;
@@ -156,6 +167,9 @@ private:
     // common part of all ctors
     void Init();
 
+    // Implement pure virtual function inherited from wxCompositeWindow.
+    virtual wxWindowList GetCompositeWindowParts() const;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -193,7 +207,7 @@ public:
 
         bool ok = wxTextCtrl::Create(parent, id, value, pos, size, style,
                                      wxDefaultValidator, name);
-        DoSetValue(initial);
+        DoSetValue(initial, SendEvent_None);
 
         return ok;
     }
@@ -229,9 +243,20 @@ protected:
         return n;
     }
 
-    bool DoSetValue(double val)
+    bool DoSetValue(double val, SendEvent sendEvent)
     {
-        wxTextCtrl::SetValue(wxString::Format(m_format.c_str(), val));
+        wxString str(wxString::Format(m_format, val));
+        switch ( sendEvent )
+        {
+            case SendEvent_None:
+                wxTextCtrl::ChangeValue(str);
+                break;
+
+            case SendEvent_Text:
+                wxTextCtrl::SetValue(str);
+                break;
+        }
+
         return true;
     }
     void DoSetRange(double min_val, double max_val)
@@ -297,7 +322,7 @@ public:
     // operations
     void SetValue(const wxString& value)
         { wxSpinCtrlGenericBase::SetValue(value); }
-    void SetValue( int value )              { DoSetValue(value); }
+    void SetValue( int value )              { DoSetValue(value, SendEvent_None); }
     void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); }
     void SetIncrement(int inc) { DoSetIncrement(inc); }
 
@@ -373,7 +398,7 @@ public:
     // operations
     void SetValue(const wxString& value)
         { wxSpinCtrlGenericBase::SetValue(value); }
-    void SetValue(double value)                 { DoSetValue(value); }
+    void SetValue(double value)                 { DoSetValue(value, SendEvent_None); }
     void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); }
     void SetIncrement(double inc)               { DoSetIncrement(inc); }
     void SetDigits(unsigned digits);