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 e0e3bcb59780f510ac6115529c9f1da24b9bd0db..478fdfc1e0534e458109cd88b0ccf8548e6c4995 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -57,7 +57,7 @@ public:
     }
 
 protected:
     }
 
 protected:

-     void OnKillFocus(wxFocusEvent &event)
+     void OnKillFocus(wxFocusEvent& WXUNUSED(event))

      {
          long l;
          if ( !GetValue().ToLong(&l) )
      {
          long l;
          if ( !GetValue().ToLong(&l) )


@@ -65,35 +65,35 @@ protected:
              // not a number at all
              return;
          }
              // 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();
          // 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 );
          // 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 (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);
              // 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;
              m_spin->m_oldValue = l;

-         } 
+         }

     }
     }

-   
+

     void OnTextChange(wxCommandEvent& event)
     {
         int val;
     void OnTextChange(wxCommandEvent& event)
     {
         int val;