fixed wxMac's wxListCtrl::SetColumnWidth(-1, ...) to really set width for every column

[wxWidgets.git] / src / mac / carbon / spinctrl.cpp

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 478fdfc1e0534e458109cd88b0ccf8548e6c4995..f9b3fb9e95d347ea467fc7c14ee378aa599f8164 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -29,7 +29,10 @@
 // we handle these problems right now in an extended vis region of a window
 static const wxCoord TEXTBORDER = 4 ;
 // the margin between the text control and the spin
-static const wxCoord MARGIN = 8 - TEXTBORDER;
+// HIG says 2px between text and stepper control,
+// but a value of 3 leads to the same look as the
+// spin controls in Apple's apps
+static const wxCoord MARGIN = 3;
 
 // ----------------------------------------------------------------------------
 // wxSpinCtrlText: text control used by spin control
@@ -88,7 +91,7 @@ protected:
              wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
              event.SetEventObject(m_spin);
              event.SetInt(l);
-             m_spin->GetEventHandler()->ProcessEvent(event);
+             m_spin->HandleWindowEvent(event);
 
              m_spin->m_oldValue = l;
          }
@@ -116,7 +119,7 @@ protected:
             event.SetString(m_spin->GetText()->GetValue());
             event.SetInt(val);
 
-            m_spin->GetEventHandler()->ProcessEvent(event);
+            m_spin->HandleWindowEvent(event);
         }
 
         event.Skip();
@@ -166,7 +169,7 @@ protected:
         event.SetEventObject(m_spin);
         event.SetInt(pos);
 
-        m_spin->GetEventHandler()->ProcessEvent(event);
+        m_spin->HandleWindowEvent(event);
 
         m_spin->m_oldValue = pos;
     }
@@ -307,7 +310,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
     wxCoord wText = width - sizeBtn.x - MARGIN - 2 * TEXTBORDER;
 
     m_text->SetSize(TEXTBORDER, (height - sizeText.y) / 2, wText, -1);
-    m_btn->SetSize(0 + wText + MARGIN + 2 * TEXTBORDER , (height - sizeBtn.y) / 2 , -1, -1 );
+    m_btn->SetSize(0 + wText + MARGIN + TEXTBORDER , (height - sizeBtn.y) / 2 , -1, -1 );
 }
 
 // ----------------------------------------------------------------------------