applied patch 890642: wxRE_ADVANCED flag and docs

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

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 2438d11b7297eb59af20dbaca27d8d78f085cbc1..34b9c39b5159aa8c07579b5670ce0b7c34bda79e 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -13,7 +13,7 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

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

     #pragma implementation "spinctrlbase.h"
     #pragma implementation "spinctrl.h"
 #endif
     #pragma implementation "spinctrlbase.h"
     #pragma implementation "spinctrl.h"
 #endif


@@ -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
 


@@ -50,10 +50,76 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxSpinCtrlStyle )
+
+wxBEGIN_FLAGS( wxSpinCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+    
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSP_VERTICAL)
+    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
+    wxFLAGS_MEMBER(wxSP_WRAP)
+
+wxEND_FLAGS( wxSpinCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl,"wx/spinbut.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
+    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxSpinEvent )
+    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SPINCTRL_UPDATED , wxCommandEvent )
+    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent ) 
+    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
+
+    wxPROPERTY( ValueString , wxString , SetValue , GetValue , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) ;
+       wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       wxPROPERTY( Min , int , SetMin, GetMin, 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+       wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxSpinCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+/*
+       TODO PROPERTIES
+               style wxSP_ARROW_KEYS
+*/
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxSpinCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxSpinCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , ValueString , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+#else

 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)

+#endif

 
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
 
 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()
 


@@ -83,11 +149,20 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
                                             WPARAM wParam,
                                             LPARAM lParam)
 {
                                             WPARAM wParam,
                                             LPARAM lParam)
 {

-    wxSpinCtrl *spin = (wxSpinCtrl *)::GetWindowLong(hwnd, GWL_USERDATA);
+    wxSpinCtrl *spin = (wxSpinCtrl *)wxGetWindowUserData(hwnd);

 
 

-    // 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_CHAR:
         case WM_DEADCHAR:
         case WM_KEYUP:


@@ -95,10 +170,15 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
             spin->MSWWindowProc(message, wParam, lParam);
 
             // The control may have been deleted at this point, so check.
             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))
+            if ( !::IsWindow(hwnd) || wxGetWindowUserData(hwnd) != spin )

                 return 0;
             break;
                 return 0;
             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);
 }


@@ -106,8 +186,7 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
 /* static */
 wxSpinCtrl *wxSpinCtrl::GetSpinForTextCtrl(WXHWND hwndBuddy)
 {
 /* static */
 wxSpinCtrl *wxSpinCtrl::GetSpinForTextCtrl(WXHWND hwndBuddy)
 {

-    wxSpinCtrl *spin = (wxSpinCtrl *)::GetWindowLong((HWND)hwndBuddy,
-                                                     GWL_USERDATA);
+    wxSpinCtrl *spin = (wxSpinCtrl *)wxGetWindowUserData((HWND)hwndBuddy);

 
     int i = ms_allSpins.Index(spin);
 
 
     int i = ms_allSpins.Index(spin);
 


@@ -154,7 +233,7 @@ bool wxSpinCtrl::ProcessTextCommand(WXWORD cmd, WXWORD WXUNUSED(id))
 
 void wxSpinCtrl::OnChar(wxKeyEvent& event)
 {
 
 void wxSpinCtrl::OnChar(wxKeyEvent& event)
 {

-    switch ( event.KeyCode() )
+    switch ( event.GetKeyCode() )

     {
         case WXK_RETURN:
             {
     {
         case WXK_RETURN:
             {


@@ -189,6 +268,15 @@ void wxSpinCtrl::OnChar(wxKeyEvent& event)
     event.Skip();
 }
 
     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
 // ----------------------------------------------------------------------------


@@ -206,8 +294,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);


@@ -227,35 +322,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);
-
-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
-    int msStyle = WS_CHILD;
-
-    // Even with extended styles, need to combine with WS_BORDER for them to
-    // look right.
-    if ( want3D || wxStyleHasBorder(style) )
-        msStyle |= WS_BORDER;
-
-    if ( style & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
-
+    // 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
                     (

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

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

-                     msStyle /* | 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


@@ -271,10 +351,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_wndProcBuddy = (WXFARPROC)::GetWindowLong(GetBuddyHwnd(), GWL_WNDPROC);
-    ::SetWindowLong(GetBuddyHwnd(), GWL_USERDATA, (LONG)this);
-    ::SetWindowLong(GetBuddyHwnd(), GWL_WNDPROC, (LONG)wxBuddyTextWndProc);
+    wxSetWindowUserData(GetBuddyHwnd(), this);
+    m_wndProcBuddy = (WXFARPROC)wxSetWindowProc(GetBuddyHwnd(),
+                                                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());


@@ -313,6 +403,10 @@ wxSpinCtrl::~wxSpinCtrl()
 {
     ms_allSpins.Remove(this);
 
 {
     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
     ::DestroyWindow(GetBuddyHwnd());
     // destroy the buddy window because this pointer which wxBuddyTextWndProc
     // uses will not soon be valid any more
     ::DestroyWindow(GetBuddyHwnd());


@@ -341,6 +435,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
 // ----------------------------------------------------------------------------


@@ -419,7 +525,12 @@ wxSize wxSpinCtrl::DoGetBestSize() const
     wxGetCharSize(GetHWND(), NULL, &y, &GetFont());
     y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
 
     wxGetCharSize(GetHWND(), NULL, &y, &GetFont());
     y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(y);
 

-    if ( sizeBtn.y < y )
+    // JACS: we should always use the height calculated
+    // from above, because otherwise we'll get a spin control
+    // that's too big. So never use the height calculated
+    // from wxSpinButton::DoGetBestSize().
+    
+    // if ( sizeBtn.y < y )

     {
         // make the text tall enough
         sizeBtn.y = y;
     {
         // make the text tall enough
         sizeBtn.y = y;