1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 4a5d3d56aa07e7c1929eeb4ac980b804a6f01476..677e2f181af84e589730abe64eab3e7b059d3589 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


@@ -12,12 +12,17 @@
 #ifndef _WX_MSW_SPINCTRL_H_
 #define _WX_MSW_SPINCTRL_H_
 
 #ifndef _WX_MSW_SPINCTRL_H_
 #define _WX_MSW_SPINCTRL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "spinctrl.h"
 #endif
 
 #include "wx/spinbutt.h"    // the base class
 
     #pragma interface "spinctrl.h"
 #endif
 
 #include "wx/spinbutt.h"    // the base class
 

+#include "wx/dynarray.h"
+
+class WXDLLEXPORT wxSpinCtrl;
+WX_DEFINE_EXPORTED_ARRAY_PTR(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,29 +59,61 @@ 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
     // -------------------------------
 

+    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);
 
 
     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 SetFocus();
+    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);
+    void OnSetFocus(wxFocusEvent& 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)
     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_