removed USE_SHARED_LIBRARY mentions (and all variations in spelling) (patch 1231184)

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 00a59e4527677c1006833039b00557c4748b5391..69a34ceec5a28878f9b298cae8227c14e885e4de 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -50,9 +50,13 @@
 #include <Multiprocessing.h>
 #endif
 
+#ifdef __DARWIN__
+#include <Carbon/Carbon.h>
+#else
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
+#endif
 #endif // wxUSE_GUI
 
 #include  "wx/mac/private.h"  // includes mac headers
@@ -93,7 +97,7 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 // debugging support
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+#if defined(__WXDEBUG__) && defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
 
 // MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
 
@@ -1382,7 +1386,6 @@ void wxMacControl::ScrollRect( wxRect *r , int dx , int dy )
        {
                Rect bounds ;
                GetControlBounds( m_controlRef , &bounds ) ;
-               Point topleft = { bounds.top , bounds.left } ;
                bounds.left += r->x ;
                bounds.top += r->y ;
                bounds.bottom = bounds.top + r->height ;