minor compilation warning corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 354d3d2aec4dd5e7c72c7b886cee4a99e7d9acbe..a85398f27f7bd4d52636da640d74f26dfe9d826d 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -220,9 +220,9 @@ bool wxClipboard::AddData( wxDataObject *data )
                     array[i].GetId().c_str() );
 
 #if !TARGET_CARBON
-          OSErr err = noErr ;
+        OSErr err = noErr ;
 #else
-          OSStatus err = noErr ;
+        OSStatus err = noErr ;
 #endif
 
        switch ( array[i].GetType() )

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 0dcfb505d021b2368ce23336d8705d3383ce6be0..cc93410764b4515916c2c0267e74ced50e9b622e 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -473,7 +473,7 @@ void  wxControl::DoSetSize(int x, int y,
         return ;
     }
 
-     Rect oldbounds, newbounds;
+     Rect oldbounds;
      int new_x, new_y, new_width, new_height;
      int mac_x, mac_y;
  

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index bba19b5b4cd1dd13020624ff45883aaa301cbba7..f44f47270f3340ead770515b6b186d31cc9cc7bb 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -52,8 +52,6 @@ const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;
 
-#define wxMAC_EXPERIMENTAL_PATTERN 0
-
 wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
        m_ph( (GrafPtr) dc->m_macPort ) 
 {

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index e81ad045d29757e8b92c9b029d286972643bbaf8..cfe9297e3c3147f4c57f9c8c92de38d50291b421 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -86,7 +86,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
       
       if ( data )
       {
-        int formatcount = data->GetFormatCount() ;
+        size_t formatcount = data->GetFormatCount() ;
         wxDataFormat *array = new wxDataFormat[ formatcount  ];
         data->GetAllFormats( array );
         for (size_t i = 0; !supported && i < formatcount ; i++)
@@ -142,7 +142,7 @@ bool wxDropTarget::GetData()
       
       if ( data )
       {
-        int formatcount = data->GetFormatCount() ;
+        size_t formatcount = data->GetFormatCount() ;
         wxDataFormat *array = new wxDataFormat[ formatcount  ];
         data->GetAllFormats( array );
         for (size_t i = 0; !transferred && i < formatcount ; i++)
@@ -272,7 +272,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     OSErr result;
     DragReference theDrag;
     RgnHandle dragRegion;
-    if (result = NewDrag(&theDrag)) 
+    if ((result = NewDrag(&theDrag)))
     {
         return wxDragNone ;
     }
@@ -281,7 +281,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     wxDataFormat *formats = new wxDataFormat[formatCount] ;
     m_data->GetAllFormats( formats ) ;
     ItemReference theItem = 1 ;
-    for ( int i = 0 ; i < formatCount ; ++i )
+    for ( size_t i = 0 ; i < formatCount ; ++i )
     {
         size_t dataSize = m_data->GetDataSize( formats[i] ) ;
         Ptr dataPtr = new char[dataSize] ;
@@ -396,7 +396,6 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
     MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
     Point mouse, localMouse;
     DragAttributes attributes;
-    RgnHandle hiliteRgn;
     GetDragAttributes(theDrag, &attributes);
     wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 
     switch(theMessage) 

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index 354d3d2aec4dd5e7c72c7b886cee4a99e7d9acbe..a85398f27f7bd4d52636da640d74f26dfe9d826d 100644 (file)
--- a/src/mac/clipbrd.cpp
+++ b/src/mac/clipbrd.cpp
@@ -220,9 +220,9 @@ bool wxClipboard::AddData( wxDataObject *data )
                     array[i].GetId().c_str() );
 
 #if !TARGET_CARBON
-          OSErr err = noErr ;
+        OSErr err = noErr ;
 #else
-          OSStatus err = noErr ;
+        OSStatus err = noErr ;
 #endif
 
        switch ( array[i].GetType() )

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 0dcfb505d021b2368ce23336d8705d3383ce6be0..cc93410764b4515916c2c0267e74ced50e9b622e 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -473,7 +473,7 @@ void  wxControl::DoSetSize(int x, int y,
         return ;
     }
 
-     Rect oldbounds, newbounds;
+     Rect oldbounds;
      int new_x, new_y, new_width, new_height;
      int mac_x, mac_y;
  

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index bba19b5b4cd1dd13020624ff45883aaa301cbba7..f44f47270f3340ead770515b6b186d31cc9cc7bb 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -52,8 +52,6 @@ const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;
 
-#define wxMAC_EXPERIMENTAL_PATTERN 0
-
 wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
        m_ph( (GrafPtr) dc->m_macPort ) 
 {

diff --git a/src/mac/dnd.cpp b/src/mac/dnd.cpp
index e81ad045d29757e8b92c9b029d286972643bbaf8..cfe9297e3c3147f4c57f9c8c92de38d50291b421 100644 (file)
--- a/src/mac/dnd.cpp
+++ b/src/mac/dnd.cpp
@@ -86,7 +86,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
       
       if ( data )
       {
-        int formatcount = data->GetFormatCount() ;
+        size_t formatcount = data->GetFormatCount() ;
         wxDataFormat *array = new wxDataFormat[ formatcount  ];
         data->GetAllFormats( array );
         for (size_t i = 0; !supported && i < formatcount ; i++)
@@ -142,7 +142,7 @@ bool wxDropTarget::GetData()
       
       if ( data )
       {
-        int formatcount = data->GetFormatCount() ;
+        size_t formatcount = data->GetFormatCount() ;
         wxDataFormat *array = new wxDataFormat[ formatcount  ];
         data->GetAllFormats( array );
         for (size_t i = 0; !transferred && i < formatcount ; i++)
@@ -272,7 +272,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     OSErr result;
     DragReference theDrag;
     RgnHandle dragRegion;
-    if (result = NewDrag(&theDrag)) 
+    if ((result = NewDrag(&theDrag)))
     {
         return wxDragNone ;
     }
@@ -281,7 +281,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     wxDataFormat *formats = new wxDataFormat[formatCount] ;
     m_data->GetAllFormats( formats ) ;
     ItemReference theItem = 1 ;
-    for ( int i = 0 ; i < formatCount ; ++i )
+    for ( size_t i = 0 ; i < formatCount ; ++i )
     {
         size_t dataSize = m_data->GetDataSize( formats[i] ) ;
         Ptr dataPtr = new char[dataSize] ;
@@ -396,7 +396,6 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
     MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
     Point mouse, localMouse;
     DragAttributes attributes;
-    RgnHandle hiliteRgn;
     GetDragAttributes(theDrag, &attributes);
     wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; 
     switch(theMessage)