Applied drag fix to row labels as well

[wxWidgets.git] / src / generic / spinctlg.cpp

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index ff767d2848d3b917de3543e5b700420eb24390f1..c0dca645a1f22da70b76ff441f22ae6b51a8d705 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,8 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || defined(__WXMAC__) || \
-    defined(__WXUNIVERSAL__)
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \
+    defined(__WXMAC__) || defined(__WXUNIVERSAL__)

 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"


@@ -134,7 +134,7 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)

-
+    

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -160,7 +160,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                         int initial,
                         const wxString& name)
 {
                         int initial,
                         const wxString& name)
 {

-    if ( !wxControl::Create(parent, id, pos, size, style,
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style,

                             wxDefaultValidator, name) )
     {
         return FALSE;
                             wxDefaultValidator, name) )
     {
         return FALSE;


@@ -232,15 +232,18 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x, y, width, height);
 
 {
     wxControl::DoMoveWindow(x, y, width, height);
 

+    wxPoint p = GetParent() ? 
+                GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
+

     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;
     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;

-    m_text->SetSize(x, y, wText, height);
+    m_text->SetSize(x-p.x, y-p.y, wText, height);

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-    m_btn->SetSize(x + wText + MARGIN, y, -1, -1);
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, -1);

 #else
 #else

-    m_btn->SetSize(x + wText + MARGIN, y, -1, height);
+    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);

 #endif
 }
 
 #endif
 }