Update to Scintilla 1.53

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 243e7b6833b73da5703c2ff43106db44300eeed0..40acd606bde09cdd0f86037d42d596049ed34958 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -18,6 +18,11 @@
 
 #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,6 +59,9 @@ 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);
 

+    // another wxTextCtrl-like method
+    void SetSelection(long from, long to);
+

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 


@@ -70,7 +78,16 @@ public:
     // wxSpinButton doesn't accept focus, but we do
     virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
 
     // wxSpinButton doesn't accept focus, but we do
     virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
 

-    WXFARPROC GetBuddyWndProc() const { return m_oldBuddyWndProc; }
+    // 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:
     virtual void DoGetPosition(int *x, int *y) const;
 
 protected:
     virtual void DoGetPosition(int *x, int *y) const;


@@ -81,13 +98,22 @@ protected:
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 

+    // Handle processing of special keys
+    void OnChar(wxKeyEvent& event);
+    void OnSetFocus(wxFocusEvent& event);
+

     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;

-    WXFARPROC  m_oldBuddyWndProc;
+    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)
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxSpinCtrl)

 };
 
 #endif // _WX_MSW_SPINCTRL_H_
 };
 
 #endif // _WX_MSW_SPINCTRL_H_