fixed DrawText to use text colours instead of pen+brush colours

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index bc2962811b9ad6bc77cdb0a8a973569a74373768..5f268188b9e3e1e76f676d2aaa81f17098b718bf 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -11,12 +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/scrolbar.h"

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


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

-    return best;  
+    return best;

 }
 }