Document that wxDC::FloodFill() is not implemented under wxOSX.

[wxWidgets.git] / include / wx / generic / spinctlg.h

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 338dd70234a809f678a71cbaf982bc62f997bb4c..ff30a8ef9d1020632a13c3015dc39b148af9c9eb 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -22,6 +22,8 @@
 
 #if wxUSE_SPINBTN
 
 
 #if wxUSE_SPINBTN
 

+#include "wx/compositewin.h"
+

 class WXDLLIMPEXP_FWD_CORE wxSpinButton;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 class WXDLLIMPEXP_FWD_CORE wxSpinButton;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 


@@ -40,7 +42,8 @@ class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase
 // function ambiguity.
 // ----------------------------------------------------------------------------
 
 // function ambiguity.
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxSpinCtrlBase
+class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase
+                : public wxNavigationEnabled<wxCompositeWindow<wxSpinCtrlBase> >

 {
 public:
     wxSpinCtrlGenericBase() { Init(); }
 {
 public:
     wxSpinCtrlGenericBase() { Init(); }


@@ -81,11 +84,12 @@ public:
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);

-    virtual bool Reparent(wxWindowBase *newParent);

 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip(wxToolTip *tip);
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_TOOLTIPS
     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; }
     // get the subcontrols
     wxTextCtrl   *GetText() const       { return m_textCtrl; }
     wxSpinButton *GetSpinButton() const { return m_spinButton; }


@@ -106,8 +110,14 @@ public:
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
 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);
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

+#ifdef __WXMSW__
+    // and, for MSW, enabling this window itself
+    virtual void DoEnable(bool enable);
+#endif // __WXMSW__
+

     // generic double valued functions
     double DoGetValue() const { return m_value; }
     bool DoSetValue(double val);
     // generic double valued functions
     double DoGetValue() const { return m_value; }
     bool DoSetValue(double val);


@@ -125,6 +135,10 @@ protected:
     // Send the correct event type
     virtual void DoSendEvent() = 0;
 
     // Send the correct event type
     virtual void DoSendEvent() = 0;
 

+    // Convert the text to/from the corresponding value.
+    virtual bool DoTextToValue(const wxString& text, double *val) = 0;
+    virtual wxString DoValueToText(double val) = 0;
+

     // check if the value is in range
     bool InRange(double n) const { return (n >= m_min) && (n <= m_max); }
 
     // check if the value is in range
     bool InRange(double n) const { return (n >= m_min) && (n <= m_max); }
 


@@ -137,7 +151,6 @@ protected:
     double m_max;
     double m_increment;
     bool   m_snap_to_ticks;
     double m_max;
     double m_increment;
     bool   m_snap_to_ticks;

-    wxString m_format;

 
     int m_spin_value;
 
 
     int m_spin_value;
 


@@ -149,6 +162,9 @@ private:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // Implement pure virtual function inherited from wxCompositeWindow.
+    virtual wxWindowList GetCompositeWindowParts() const;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -253,7 +269,7 @@ protected:
 class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlGenericBase
 {
 public:
 class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlGenericBase
 {
 public:

-    wxSpinCtrl() {}
+    wxSpinCtrl() { Init(); }

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


@@ -263,6 +279,8 @@ public:
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxT("wxSpinCtrl"))
     {
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxT("wxSpinCtrl"))
     {

+        Init();
+

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


@@ -292,9 +310,24 @@ public:
     void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); }
     void SetIncrement(int inc) { DoSetIncrement(inc); }
 
     void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); }
     void SetIncrement(int inc) { DoSetIncrement(inc); }
 

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

 protected:
     virtual void DoSendEvent();
 
 protected:
     virtual void DoSendEvent();
 

+    virtual bool DoTextToValue(const wxString& text, double *val);
+    virtual wxString DoValueToText(double val);
+
+private:
+    // Common part of all ctors.
+    void Init()
+    {
+        m_base = 10;
+    }
+
+    int m_base;
+

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


@@ -307,7 +340,7 @@ protected:
 class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlGenericBase
 {
 public:
 class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlGenericBase
 {
 public:

-    wxSpinCtrlDouble() : m_digits(0) { }
+    wxSpinCtrlDouble() { Init(); }

     wxSpinCtrlDouble(wxWindow *parent,
                      wxWindowID id = wxID_ANY,
                      const wxString& value = wxEmptyString,
     wxSpinCtrlDouble(wxWindow *parent,
                      wxWindowID id = wxID_ANY,
                      const wxString& value = wxEmptyString,


@@ -318,7 +351,8 @@ public:
                      double inc = 1,
                      const wxString& name = wxT("wxSpinCtrlDouble"))
     {
                      double inc = 1,
                      const wxString& name = wxT("wxSpinCtrlDouble"))
     {

-        m_digits = 0;
+        Init();
+

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


@@ -353,11 +387,29 @@ public:
     void SetIncrement(double inc)               { DoSetIncrement(inc); }
     void SetDigits(unsigned digits);
 
     void SetIncrement(double inc)               { DoSetIncrement(inc); }
     void SetDigits(unsigned digits);
 

+    // We don't implement bases support for floating point numbers, this is not
+    // very useful in practice.
+    virtual int GetBase() const { return 10; }
+    virtual bool SetBase(int WXUNUSED(base)) { return 0; }
+

 protected:
     virtual void DoSendEvent();
 
 protected:
     virtual void DoSendEvent();
 

+    virtual bool DoTextToValue(const wxString& text, double *val);
+    virtual wxString DoValueToText(double val);
+

     unsigned m_digits;
 
     unsigned m_digits;
 

+private:
+    // Common part of all ctors.
+    void Init()
+    {
+        m_digits = 0;
+        m_format = wxS("%g");
+    }
+
+    wxString m_format;
+

     DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
 };