Speed fix for wxGenericDirCtrl, starting to add text input control;

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 9a160ff7aae9021a008487d61e2e5e21e832393b..243e7b6833b73da5703c2ff43106db44300eeed0 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
@@ -57,6 +57,8 @@ public:
     // implementation only from now on
     // -------------------------------
 
+    virtual ~wxSpinCtrl();
+
     virtual void SetValue(int val) { wxSpinButton::SetValue(val); }
     virtual int  GetValue() const;
     virtual bool SetFont(const wxFont &font);
@@ -65,16 +67,23 @@ public:
     virtual bool Enable(bool enable = TRUE);
     virtual bool Show(bool show = TRUE);
 
-    virtual bool AcceptsFocus() const { return TRUE; }
+    // wxSpinButton doesn't accept focus, but we do
+    virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
+
+    WXFARPROC GetBuddyWndProc() const { return m_oldBuddyWndProc; }
 
 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 DoGetSize(int *width, int *height) const;
 
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 
-    WXHWND m_hwndBuddy;
+    // the data for the "buddy" text ctrl
+    WXHWND     m_hwndBuddy;
+    WXFARPROC  m_oldBuddyWndProc;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)