corrected a bug in dc which resetted the port , exchanged the wxchoice implementation

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index f6c8f8fd52210371cb0aa158cc366bbab3243983..372cd47d61076baa04956781f241880f2c180dc9 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////

 // Name:        msw/spinctrl.h
 // Purpose:     wxSpinCtrl class declaration for Win32
 // Author:      Vadim Zeitlin
 // Name:        msw/spinctrl.h
 // Purpose:     wxSpinCtrl class declaration for Win32
 // Author:      Vadim Zeitlin


@@ -18,6 +18,10 @@
 
 #include "wx/spinbutt.h"    // the base class
 
 
 #include "wx/spinbutt.h"    // the base class
 

+#include "wx/dynarray.h"
+class WXDLLEXPORT wxSpinCtrl;
+WX_DEFINE_EXPORTED_ARRAY(wxSpinCtrl *, wxArraySpins);
+

 // ----------------------------------------------------------------------------
 // Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call
 // it) text window whose contents is automatically updated when the spin
 // ----------------------------------------------------------------------------
 // Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call
 // it) text window whose contents is automatically updated when the spin


@@ -54,19 +58,52 @@ public:
     // because the base class already has one returning int!)
     void SetValue(const wxString& text);
 
     // because the base class already has one returning int!)
     void SetValue(const wxString& text);
 

-    // override some of the base class virtuals
+    // implementation only from now on
+    // -------------------------------
+
+    virtual ~wxSpinCtrl();
+

     virtual void SetValue(int val) { wxSpinButton::SetValue(val); }
     virtual void SetValue(int val) { wxSpinButton::SetValue(val); }

-    virtual int GetValue() const;
+    virtual int  GetValue() const;

     virtual bool SetFont(const wxFont &font);
     virtual bool SetFont(const wxFont &font);

+    virtual void SetFocus();
+
+    virtual bool Enable(bool enable = TRUE);
+    virtual bool Show(bool show = TRUE);
+
+    // wxSpinButton doesn't accept focus, but we do
+    virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
+
+    // for internal use only
+
+    // get the subclassed window proc of the buddy text
+    WXFARPROC GetBuddyWndProc() const { return m_wndProcBuddy; }
+
+    // return the spinctrl object whose buddy is the given window or NULL
+    static wxSpinCtrl *GetSpinForTextCtrl(WXHWND hwndBuddy);
+
+    // process a WM_COMMAND generated by the buddy text control
+    bool ProcessTextCommand(WXWORD cmd, WXWORD id);

 
 protected:
 
 protected:

+    virtual void DoGetPosition(int *x, int *y) const;

     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;

+    virtual void DoGetSize(int *width, int *height) const;

 
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 
 
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 

-    WXHWND m_hwndBuddy;
+    // Handle processing of special keys
+    void OnChar(wxKeyEvent& event);
+
+    // the data for the "buddy" text ctrl
+    WXHWND     m_hwndBuddy;
+    WXFARPROC  m_wndProcBuddy;
+
+    // all existing wxSpinCtrls - this allows to find the one corresponding to
+    // the given buddy window in GetSpinForTextCtrl()
+    static wxArraySpins ms_allSpins;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)