Fix STL compilation (note: this is not the correct fix, but since

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 00a59e4527677c1006833039b00557c4748b5391..479e31e3cd73ecc234bf2624d12dea8014d1ffe5 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -93,7 +93,7 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 // debugging support
 // ----------------------------------------------------------------------------
 
 // 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...
 
 
 // MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
 


@@ -1382,7 +1382,6 @@ void wxMacControl::ScrollRect( wxRect *r , int dx , int dy )
        {
                Rect bounds ;
                GetControlBounds( m_controlRef , &bounds ) ;
        {
                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 ;
                bounds.left += r->x ;
                bounds.top += r->y ;
                bounds.bottom = bounds.top + r->height ;