reSWIGged

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

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 907fb9f882865446d6115335f57d2e718bc9c4fb..39960aed328749fe6025ebc65d313b2b25e38528 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -46,6 +46,7 @@
 #include <limits.h>         // for INT_MIN
 
 #define USE_DEFERRED_SIZING 1
 #include <limits.h>         // for INT_MIN
 
 #define USE_DEFERRED_SIZING 1

+#define USE_DEFER_BUG_WORKAROUND 0

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -393,7 +394,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // 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);
 

-    if ( !value.IsEmpty() )
+    if ( !value.empty() )

     {
         SetValue(value);
     }
     {
         SetValue(value);
     }


@@ -437,7 +438,7 @@ int wxSpinCtrl::GetValue() const
     long n;
     if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
         n = INT_MIN;
     long n;
     if ( (wxSscanf(val, wxT("%lu"), &n) != 1) )
         n = INT_MIN;

-        
+

     if (n < m_min) n = m_min;
     if (n > m_max) n = m_max;
 
     if (n < m_min) n = m_min;
     if (n > m_max) n = m_max;
 


@@ -572,13 +573,12 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
     // if our parent had prepared a defer window handle for us, use it (unless
     // we are a top level window)
     wxWindowMSW *parent = GetParent();
     // if our parent had prepared a defer window handle for us, use it (unless
     // we are a top level window)
     wxWindowMSW *parent = GetParent();

-    int originalX = x;

 
 #if USE_DEFERRED_SIZING
     HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
 #else
     HDWP hdwp = 0;
 
 #if USE_DEFERRED_SIZING
     HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
 #else
     HDWP hdwp = 0;

-#endif    
+#endif

 
     // 1) The buddy window
     wxMoveWindowDeferred(hdwp, this, GetBuddyHwnd(),
 
     // 1) The buddy window
     wxMoveWindowDeferred(hdwp, this, GetBuddyHwnd(),


@@ -589,35 +589,18 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
     wxMoveWindowDeferred(hdwp, this, GetHwnd(),
                      x, y, widthBtn, height);
 
     wxMoveWindowDeferred(hdwp, this, GetHwnd(),
                      x, y, widthBtn, height);
 

-    if (hdwp)
+#if USE_DEFERRED_SIZING
+    if (parent)

     {
     {

-        // Store the size so we can report it accurately
-        wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
-        if (!extraData)
-        {
-            extraData = new wxExtraWindowData;
-            m_windowReserved = (void*) extraData;
-        }
-        extraData->m_pos = wxPoint(originalX, y);
-        extraData->m_size = wxSize(width, height);
-        extraData->m_deferring = true;
-

         // hdwp must be updated as it may have been changed
         parent->m_hDWP = (WXHANDLE)hdwp;
     }
         // hdwp must be updated as it may have been changed
         parent->m_hDWP = (WXHANDLE)hdwp;
     }

+#endif

 }
 
 // get total size of the control
 void wxSpinCtrl::DoGetSize(int *x, int *y) const
 {
 }
 
 // get total size of the control
 void wxSpinCtrl::DoGetSize(int *x, int *y) const
 {

-    wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
-    if (extraData && extraData->m_deferring && GetParent() && GetParent()->m_hDWP)
-    {
-        *x = extraData->m_size.x;        
-        *y = extraData->m_size.y;
-        return;
-    }
-    

     RECT spinrect, textrect, ctrlrect;
     GetWindowRect(GetHwnd(), &spinrect);
     GetWindowRect(GetBuddyHwnd(), &textrect);
     RECT spinrect, textrect, ctrlrect;
     GetWindowRect(GetHwnd(), &spinrect);
     GetWindowRect(GetBuddyHwnd(), &textrect);


@@ -631,14 +614,6 @@ void wxSpinCtrl::DoGetSize(int *x, int *y) const
 
 void wxSpinCtrl::DoGetPosition(int *x, int *y) const
 {
 
 void wxSpinCtrl::DoGetPosition(int *x, int *y) const
 {

-    wxExtraWindowData* extraData = (wxExtraWindowData*) m_windowReserved;
-    if (extraData && extraData->m_deferring && GetParent() && GetParent()->m_hDWP)
-    {
-        *x = extraData->m_pos.x;        
-        *y = extraData->m_pos.y;
-        return;
-    }
-

     // hack: pretend that our HWND is the text control just for a moment
     WXHWND hWnd = GetHWND();
     wxConstCast(this, wxSpinCtrl)->m_hWnd = m_hwndBuddy;
     // hack: pretend that our HWND is the text control just for a moment
     WXHWND hWnd = GetHWND();
     wxConstCast(this, wxSpinCtrl)->m_hWnd = m_hwndBuddy;