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

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 92ed3abb33321a7324fc8b99bca546b73360b36c..e26fa27eef540726d230198bc62f63d3148baca7 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -11,13 +11,14 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#include "wx/scrolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/settings.h"

 #endif
 
 #endif
 

-#include "wx/settings.h"
-#include "wx/scrolbar.h"

 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)


@@ -68,7 +69,11 @@ int wxScrollBar::GetThumbPosition() const
     return m_peer->GetValue();
 }
 
     return m_peer->GetValue();
 }
 

-void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize, bool refresh )
+void wxScrollBar::SetScrollbar( int position,
+                                int thumbSize,
+                                int range,
+                                int pageSize,
+                                bool WXUNUSED(refresh) )

 {
     m_pageSize = pageSize;
     m_viewSize = thumbSize;
 {
     m_pageSize = pageSize;
     m_viewSize = thumbSize;


@@ -88,7 +93,7 @@ void wxScrollBar::Command( wxCommandEvent& event )
     ProcessCommand( event );
 }
 
     ProcessCommand( event );
 }
 

-void wxScrollBar::MacHandleControlClick( WXWidget control, wxInt16 controlpart, bool mouseStillDown )
+void wxScrollBar::MacHandleControlClick( WXWidget WXUNUSED(control), wxInt16 controlpart, bool mouseStillDown )

 {
     int position = m_peer->GetValue();
     int minPos = m_peer->GetMinimum();
 {
     int position = m_peer->GetValue();
     int minPos = m_peer->GetMinimum();


@@ -163,7 +168,7 @@ void wxScrollBar::MacHandleControlClick( WXWidget control, wxInt16 controlpart,
         GetEventHandler()->ProcessEvent( event );
 }
 
         GetEventHandler()->ProcessEvent( event );
 }
 

-wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF mevent )
+wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler), WXEVENTREF mevent )

 {
     int position = m_peer->GetValue();
     int minPos = m_peer->GetMinimum();
 {
     int position = m_peer->GetValue();
     int minPos = m_peer->GetMinimum();


@@ -238,5 +243,5 @@ wxSize wxScrollBar::DoGetBestSize() const
 
     wxSize best(w, h);
     CacheBestSize(best);
 
     wxSize best(w, h);
     CacheBestSize(best);

-    return best;  
+    return best;

 }
 }