unload msimg32.dll earlier (before static cleanup time) to avoid lockups when wx...

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

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index a9c852b7a5f545edf91161e39d43fbe7b0a146f5..478fdfc1e0534e458109cd88b0ccf8548e6c4995 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -57,7 +57,7 @@ public:
     }
 
 protected:
-     void OnKillFocus(wxFocusEvent &event)
+     void OnKillFocus(wxFocusEvent& WXUNUSED(event))
      {
          long l;
          if ( !GetValue().ToLong(&l) )
@@ -65,35 +65,35 @@ protected:
              // not a number at all
              return;
          }
-         
+
          // is within range
          if (l < m_spin->GetMin())
              l = m_spin->GetMin();
          if (l > m_spin->GetMax())
              l = m_spin->GetMax();
-         
+
          // Update text control
          wxString str;
          str.Printf( wxT("%d"), (int)l );
          if (str != GetValue())
              SetValue( str );
-         
+
          if (l != m_spin->m_oldValue)
          {
              // set value in spin button
              // does that trigger an event?
              m_spin->m_btn->SetValue( l );
-             
+
              // if not
              wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
              event.SetEventObject(m_spin);
              event.SetInt(l);
              m_spin->GetEventHandler()->ProcessEvent(event);
-             
+
              m_spin->m_oldValue = l;
-         } 
+         }
     }
-   
+
     void OnTextChange(wxCommandEvent& event)
     {
         int val;
@@ -202,7 +202,7 @@ void wxSpinCtrl::Init()
 {
     m_text = NULL;
     m_btn = NULL;
-    m_container.SetContainerWindow(this);
+    WX_INIT_CONTROL_CONTAINER();
 }
 
 bool wxSpinCtrl::Create(wxWindow *parent,
@@ -256,7 +256,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     //SetSize(csize);
 
     //MacPostControlCreate(pos, csize);
-    SetInitialBestSize(csize);
+    SetInitialSize(csize);
 
     return true;
 }