X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/724852daae642bbba3e02e11e972e747ed106190..eca62298b9c92fd9ff1789807685dd32f8ce470d:/src/osx/spinctrl_osx.cpp

diff --git a/src/osx/spinctrl_osx.cpp b/src/osx/spinctrl_osx.cpp
index a5849cde3f..1e56099b01 100644
--- a/src/osx/spinctrl_osx.cpp
+++ b/src/osx/spinctrl_osx.cpp
@@ -66,7 +66,7 @@ protected:
          event.SetEventObject( GetParent() );
          GetParent()->HandleWindowEvent(event);
      }
-     
+
      void OnKillFocus(wxFocusEvent& event)
      {
          long l;
@@ -102,7 +102,7 @@ protected:
 
              m_spin->m_oldValue = l;
          }
-         
+
          // delegate to parent control
          event.SetEventObject( GetParent() );
          GetParent()->HandleWindowEvent(event);
@@ -250,7 +250,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     }
 
     wxSize csize = size ;
-    m_text = new wxSpinCtrlText(this, value, style & wxTE_PROCESS_ENTER ? wxTE_PROCESS_ENTER : 0 );
+    m_text = new wxSpinCtrlText(this, value, style & ( wxTE_PROCESS_ENTER | wxALIGN_MASK ) );
     m_btn = new wxSpinCtrlButton(this, style);
 
     m_btn->SetRange(min, max);
@@ -388,9 +388,9 @@ int wxSpinCtrl::GetMax() const
 
 void wxSpinCtrl::SetTextValue(int val)
 {
-    wxCHECK_RET( m_text, _T("invalid call to wxSpinCtrl::SetTextValue") );
+    wxCHECK_RET( m_text, wxT("invalid call to wxSpinCtrl::SetTextValue") );
 
-    m_text->SetValue(wxString::Format(_T("%d"), val));
+    m_text->SetValue(wxString::Format(wxT("%d"), val));
 
     // select all text
     m_text->SetSelection(0, -1);
@@ -401,7 +401,7 @@ void wxSpinCtrl::SetTextValue(int val)
 
 void wxSpinCtrl::SetValue(int val)
 {
-    wxCHECK_RET( m_btn, _T("invalid call to wxSpinCtrl::SetValue") );
+    wxCHECK_RET( m_btn, wxT("invalid call to wxSpinCtrl::SetValue") );
 
     SetTextValue(val);
 
@@ -411,7 +411,7 @@ void wxSpinCtrl::SetValue(int val)
 
 void wxSpinCtrl::SetValue(const wxString& text)
 {
-    wxCHECK_RET( m_text, _T("invalid call to wxSpinCtrl::SetValue") );
+    wxCHECK_RET( m_text, wxT("invalid call to wxSpinCtrl::SetValue") );
 
     long val;
     if ( text.ToLong(&val) && ((val > INT_MIN) && (val < INT_MAX)) )
@@ -427,7 +427,7 @@ void wxSpinCtrl::SetValue(const wxString& text)
 
 void wxSpinCtrl::SetRange(int min, int max)
 {
-    wxCHECK_RET( m_btn, _T("invalid call to wxSpinCtrl::SetRange") );
+    wxCHECK_RET( m_btn, wxT("invalid call to wxSpinCtrl::SetRange") );
 
     m_btn->SetRange(min, max);
 }