adde wxSTC bakefile

[wxWidgets.git] / src / msw / spinctrl.cpp

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 9f2928f82a467f2b3640666e244bd0f97cc14dda..406afce6299df784f82133991ad0002a8d1d8566 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -40,7 +40,7 @@
 #include "wx/spinctrl.h"
 #include "wx/msw/private.h"
 
 #include "wx/spinctrl.h"
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 


@@ -53,9 +53,15 @@
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)

+    EVT_CHAR(wxSpinCtrl::OnChar)
+
+    EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
+

     EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
 END_EVENT_TABLE()
 
     EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
 END_EVENT_TABLE()
 

+#define GetBuddyHwnd()      (HWND)(m_hwndBuddy)
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -69,6 +75,8 @@ static const int MARGIN_BETWEEN = 1;
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+wxArraySpins wxSpinCtrl::ms_allSpins;
+

 // ----------------------------------------------------------------------------
 // wnd proc for the buddy text ctrl
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wnd proc for the buddy text ctrl
 // ----------------------------------------------------------------------------


@@ -80,21 +88,133 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
 {
     wxSpinCtrl *spin = (wxSpinCtrl *)::GetWindowLong(hwnd, GWL_USERDATA);
 
 {
     wxSpinCtrl *spin = (wxSpinCtrl *)::GetWindowLong(hwnd, GWL_USERDATA);
 

-    // forward some messages (the key ones only so far) to the spin ctrl
+    // forward some messages (the key and focus ones only so far) to
+    // the spin ctrl

     switch ( message )
     {
     switch ( message )
     {

+        case WM_SETFOCUS:
+            // if the focus comes from the spin control itself, don't set it
+            // back to it -- we don't want to go into an infinite loop
+            if ( wParam == spin->GetHWND() )
+                break;
+            //else: fall through
+
+        case WM_KILLFOCUS:

         case WM_CHAR:
         case WM_DEADCHAR:
         case WM_KEYUP:
         case WM_KEYDOWN:
             spin->MSWWindowProc(message, wParam, lParam);
         case WM_CHAR:
         case WM_DEADCHAR:
         case WM_KEYUP:
         case WM_KEYDOWN:
             spin->MSWWindowProc(message, wParam, lParam);

+
+            // The control may have been deleted at this point, so check.
+            if (!(::IsWindow(hwnd) && ((wxSpinCtrl *)::GetWindowLong(hwnd, GWL_USERDATA)) == spin))
+                return 0;

             break;
             break;

+
+        case WM_GETDLGCODE:
+            // we want to get WXK_RETURN in order to generate the event for it
+            return DLGC_WANTCHARS;

     }
 
     return ::CallWindowProc(CASTWNDPROC spin->GetBuddyWndProc(),
                             hwnd, message, wParam, lParam);
 }
 
     }
 
     return ::CallWindowProc(CASTWNDPROC spin->GetBuddyWndProc(),
                             hwnd, message, wParam, lParam);
 }
 

+/* static */
+wxSpinCtrl *wxSpinCtrl::GetSpinForTextCtrl(WXHWND hwndBuddy)
+{
+    wxSpinCtrl *spin = (wxSpinCtrl *)::GetWindowLong((HWND)hwndBuddy,
+                                                     GWL_USERDATA);
+
+    int i = ms_allSpins.Index(spin);
+
+    if ( i == wxNOT_FOUND )
+        return NULL;
+
+    // sanity check
+    wxASSERT_MSG( spin->m_hwndBuddy == hwndBuddy,
+                  _T("wxSpinCtrl has incorrect buddy HWND!") );
+
+    return spin;
+}
+
+// process a WM_COMMAND generated by the buddy text control
+bool wxSpinCtrl::ProcessTextCommand(WXWORD cmd, WXWORD WXUNUSED(id))
+{
+    switch (cmd)
+    {
+    case EN_CHANGE:
+        {
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+            event.SetEventObject(this);
+            wxString val = wxGetWindowText(m_hwndBuddy);
+            event.SetString(val);
+            event.SetInt(GetValue());
+            return GetEventHandler()->ProcessEvent(event);
+        }
+    case EN_SETFOCUS:
+    case EN_KILLFOCUS:
+        {
+            wxFocusEvent event(cmd == EN_KILLFOCUS ? wxEVT_KILL_FOCUS
+                    : wxEVT_SET_FOCUS,
+                    m_windowId);
+            event.SetEventObject( this );
+            return GetEventHandler()->ProcessEvent(event);
+        }
+     default:
+        break;
+    }
+
+    // not processed
+    return FALSE;
+}
+
+void wxSpinCtrl::OnChar(wxKeyEvent& event)
+{
+    switch ( event.GetKeyCode() )
+    {
+        case WXK_RETURN:
+            {
+                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                InitCommandEvent(event);
+                wxString val = wxGetWindowText(m_hwndBuddy);
+                event.SetString(val);
+                event.SetInt(GetValue());
+                if ( GetEventHandler()->ProcessEvent(event) )
+                    return;
+                break;
+            }
+
+        case WXK_TAB:
+            // always produce navigation event - even if we process TAB
+            // ourselves the fact that we got here means that the user code
+            // decided to skip processing of this TAB - probably to let it
+            // do its default job.
+            {
+                wxNavigationKeyEvent eventNav;
+                eventNav.SetDirection(!event.ShiftDown());
+                eventNav.SetWindowChange(event.ControlDown());
+                eventNav.SetEventObject(this);
+
+                if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )
+                    return;
+            }
+            break;
+    }
+
+    // no, we didn't process it
+    event.Skip();
+}
+
+void wxSpinCtrl::OnSetFocus(wxFocusEvent& event)
+{
+    // when we get focus, give it to our buddy window as it needs it more than
+    // we do
+    ::SetFocus((HWND)m_hwndBuddy);
+
+    event.Skip();
+}
+

 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------


@@ -112,8 +232,15 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // know whether this is a horizontal or vertical control (we're always
     // vertical)
     style |= wxSP_VERTICAL;
     // know whether this is a horizontal or vertical control (we're always
     // vertical)
     style |= wxSP_VERTICAL;

+
+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+        style |= wxBORDER_SUNKEN;
+

     SetWindowStyle(style);
 
     SetWindowStyle(style);
 

+    WXDWORD exStyle = 0;
+    WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
+

     // calculate the sizes: the size given is the toal size for both controls
     // and we need to fit them both in the given width (height is the same)
     wxSize sizeText(size), sizeBtn(size);
     // calculate the sizes: the size given is the toal size for both controls
     // and we need to fit them both in the given width (height is the same)
     wxSize sizeText(size), sizeBtn(size);


@@ -133,22 +260,20 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     wxPoint posBtn(pos);
     posBtn.x += sizeText.x + MARGIN_BETWEEN;
 
     wxPoint posBtn(pos);
     posBtn.x += sizeText.x + MARGIN_BETWEEN;
 

-    // create the spin button
-    if ( !wxSpinButton::Create(parent, id, posBtn, sizeBtn, style, name) )
-    {
-        return FALSE;
-    }
-
-    SetRange(min, max);
-    SetValue(initial);
+    // we must create the text control before the spin button for the purpose
+    // of the dialog navigation: if there is a static text just before the spin
+    // control, activating it by Alt-letter should give focus to the text
+    // control, not the spin and the dialog navigation code will give focus to
+    // the next control (at Windows level), not the one after it

 
     // create the text window
 
     // create the text window

+

     m_hwndBuddy = (WXHWND)::CreateWindowEx
                     (
     m_hwndBuddy = (WXHWND)::CreateWindowEx
                     (

-                     WS_EX_CLIENTEDGE,       // sunken border
+                     exStyle,                // sunken border

                      _T("EDIT"),             // window class
                      NULL,                   // no window title
                      _T("EDIT"),             // window class
                      NULL,                   // no window title

-                     WS_CHILD | WS_BORDER /* | WS_CLIPSIBLINGS */,   // style (will be shown later)
+                     msStyle,                // style (will be shown later)

                      pos.x, pos.y,           // position
                      0, 0,                   // size (will be set later)
                      GetHwndOf(parent),      // parent
                      pos.x, pos.y,           // position
                      0, 0,                   // size (will be set later)
                      GetHwndOf(parent),      // parent


@@ -164,10 +289,20 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

+
+    // create the spin button
+    if ( !wxSpinButton::Create(parent, id, posBtn, sizeBtn, style, name) )
+    {
+        return FALSE;
+    }
+
+    SetRange(min, max);
+    SetValue(initial);
+

     // subclass the text ctrl to be able to intercept some events
     // subclass the text ctrl to be able to intercept some events

-    m_oldBuddyWndProc = (WXFARPROC)::GetWindowLong((HWND)m_hwndBuddy, GWL_WNDPROC);
-    ::SetWindowLong((HWND)m_hwndBuddy, GWL_USERDATA, (LONG)this);
-    ::SetWindowLong((HWND)m_hwndBuddy, GWL_WNDPROC, (LONG)wxBuddyTextWndProc);
+    m_wndProcBuddy = (WXFARPROC)::GetWindowLong(GetBuddyHwnd(), GWL_WNDPROC);
+    ::SetWindowLong(GetBuddyHwnd(), GWL_USERDATA, (LONG)this);
+    ::SetWindowLong(GetBuddyHwnd(), GWL_WNDPROC, (LONG)wxBuddyTextWndProc);

 
     // should have the same font as the other controls
     SetFont(GetParent()->GetFont());
 
     // should have the same font as the other controls
     SetFont(GetParent()->GetFont());


@@ -185,7 +320,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     DoMoveWindow(pos.x, pos.y,
                  sizeText.x + sizeBtn.x + MARGIN_BETWEEN, sizeText.y);
 
     DoMoveWindow(pos.x, pos.y,
                  sizeText.x + sizeBtn.x + MARGIN_BETWEEN, sizeText.y);
 

-    (void)::ShowWindow((HWND)m_hwndBuddy, SW_SHOW);
+    (void)::ShowWindow(GetBuddyHwnd(), SW_SHOW);

 
     // associate the text window with the spin button
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
 
     // associate the text window with the spin button
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);


@@ -195,14 +330,24 @@ bool wxSpinCtrl::Create(wxWindow *parent,
         SetValue(value);
     }
 
         SetValue(value);
     }
 

+    // do it after finishing with m_hwndBuddy creation to avoid generating
+    // initial wxEVT_COMMAND_TEXT_UPDATED message
+    ms_allSpins.Add(this);
+

     return TRUE;
 }
 
 wxSpinCtrl::~wxSpinCtrl()
 {
     return TRUE;
 }
 
 wxSpinCtrl::~wxSpinCtrl()
 {

+    ms_allSpins.Remove(this);
+
+    // This removes spurious memory leak reporting
+    if (ms_allSpins.GetCount() == 0)
+        ms_allSpins.Clear();
+

     // destroy the buddy window because this pointer which wxBuddyTextWndProc
     // uses will not soon be valid any more
     // destroy the buddy window because this pointer which wxBuddyTextWndProc
     // uses will not soon be valid any more

-    ::DestroyWindow((HWND)m_hwndBuddy);
+    ::DestroyWindow(GetBuddyHwnd());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -211,7 +356,7 @@ wxSpinCtrl::~wxSpinCtrl()
 
 void wxSpinCtrl::SetValue(const wxString& text)
 {
 
 void wxSpinCtrl::SetValue(const wxString& text)
 {

-    if ( !::SetWindowText((HWND)m_hwndBuddy, text.c_str()) )
+    if ( !::SetWindowText(GetBuddyHwnd(), text.c_str()) )

     {
         wxLogLastError(wxT("SetWindowText(buddy)"));
     }
     {
         wxLogLastError(wxT("SetWindowText(buddy)"));
     }


@@ -228,6 +373,18 @@ int wxSpinCtrl::GetValue() const
     return n;
 }
 
     return n;
 }
 

+void wxSpinCtrl::SetSelection(long from, long to)
+{
+    // if from and to are both -1, it means (in wxWindows) that all text should
+    // be selected - translate into Windows convention
+    if ( (from == -1) && (to == -1) )
+    {
+        from = 0;
+    }
+
+    ::SendMessage((HWND)m_hwndBuddy, EM_SETSEL, (WPARAM)from, (LPARAM)to);
+}
+

 // ----------------------------------------------------------------------------
 // forward some methods to subcontrols
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // forward some methods to subcontrols
 // ----------------------------------------------------------------------------


@@ -241,7 +398,7 @@ bool wxSpinCtrl::SetFont(const wxFont& font)
     }
 
     WXHANDLE hFont = GetFont().GetResourceHandle();
     }
 
     WXHANDLE hFont = GetFont().GetResourceHandle();

-    (void)::SendMessage((HWND)m_hwndBuddy, WM_SETFONT, (WPARAM)hFont, TRUE);
+    (void)::SendMessage(GetBuddyHwnd(), WM_SETFONT, (WPARAM)hFont, TRUE);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -253,7 +410,7 @@ bool wxSpinCtrl::Show(bool show)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    ::ShowWindow((HWND)m_hwndBuddy, show ? SW_SHOW : SW_HIDE);
+    ::ShowWindow(GetBuddyHwnd(), show ? SW_SHOW : SW_HIDE);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -265,14 +422,14 @@ bool wxSpinCtrl::Enable(bool enable)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    ::EnableWindow((HWND)m_hwndBuddy, enable);
+    ::EnableWindow(GetBuddyHwnd(), enable);

 
     return TRUE;
 }
 
 void wxSpinCtrl::SetFocus()
 {
 
     return TRUE;
 }
 
 void wxSpinCtrl::SetFocus()
 {

-    ::SetFocus((HWND)m_hwndBuddy);
+    ::SetFocus(GetBuddyHwnd());

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -324,7 +481,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
         wxLogDebug(_T("not enough space for wxSpinCtrl!"));
     }
 
         wxLogDebug(_T("not enough space for wxSpinCtrl!"));
     }
 

-    if ( !::MoveWindow((HWND)m_hwndBuddy, x, y, widthText, height, TRUE) )
+    if ( !::MoveWindow(GetBuddyHwnd(), x, y, widthText, height, TRUE) )

     {
         wxLogLastError(wxT("MoveWindow(buddy)"));
     }
     {
         wxLogLastError(wxT("MoveWindow(buddy)"));
     }


@@ -341,7 +498,7 @@ void wxSpinCtrl::DoGetSize(int *x, int *y) const
 {
     RECT spinrect, textrect, ctrlrect;
     GetWindowRect(GetHwnd(), &spinrect);
 {
     RECT spinrect, textrect, ctrlrect;
     GetWindowRect(GetHwnd(), &spinrect);

-    GetWindowRect((HWND)m_hwndBuddy, &textrect);
+    GetWindowRect(GetBuddyHwnd(), &textrect);

     UnionRect(&ctrlrect,&textrect, &spinrect);
 
     if ( x )
     UnionRect(&ctrlrect,&textrect, &spinrect);
 
     if ( x )