Fix wxOSX warnings about int-to-void* casts.

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

diff --git a/include/wx/osx/dataobj.h b/include/wx/osx/dataobj.h
index 375d7d407939c14b2e01d00ade2b924aa83e45de..45a73f289f2cb25a927d2bf172329912bfc58778 100644 (file)
--- a/include/wx/osx/dataobj.h
+++ b/include/wx/osx/dataobj.h
@@ -24,7 +24,7 @@ public:
 #endif
 
     virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
 #endif
 
     virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;

-    void AddToPasteboard( void * pasteboardRef , int itemID );
+    void AddToPasteboard( void * pasteboardRef , wxIntPtr itemID );

     // returns true if the passed in format is present in the pasteboard
     static bool IsFormatInPasteboard( void * pasteboardRef, const wxDataFormat &dataFormat );
     // returns true if any of the accepted formats of this dataobj is in the pasteboard
     // returns true if the passed in format is present in the pasteboard
     static bool IsFormatInPasteboard( void * pasteboardRef, const wxDataFormat &dataFormat );
     // returns true if any of the accepted formats of this dataobj is in the pasteboard

diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp
index 645733f8f4b87ef459d967383acecee34ce20ba6..2b625d0e06c7a326b038469320ddc12819680833 100644 (file)
--- a/src/osx/carbon/dataobj.cpp
+++ b/src/osx/carbon/dataobj.cpp
@@ -259,7 +259,7 @@ bool wxDataObject::IsSupportedFormat( const wxDataFormat& rFormat, Direction vDi
     return found;
 }
 
     return found;
 }
 

-void wxDataObject::AddToPasteboard( void * pb, int itemID )
+void wxDataObject::AddToPasteboard( void * pb, wxIntPtr itemID )

 {
     PasteboardRef pasteboard = (PasteboardRef) pb;
    // get formats from wxDataObjects
 {
     PasteboardRef pasteboard = (PasteboardRef) pb;
    // get formats from wxDataObjects


@@ -301,7 +301,7 @@ void wxDataObject::AddToPasteboard( void * pb, int itemID )
             memset( buf, 0, sz );
             if ( GetDataHere( thisFormat, buf ) )
             {
             memset( buf, 0, sz );
             if ( GetDataHere( thisFormat, buf ) )
             {

-                int counter = 1 ;
+                wxIntPtr counter = 1 ;

                 if ( thisFormat.GetType() == wxDF_FILENAME )
                 {
                     // the data is D-normalized UTF8 strings of filenames delimited with \n
                 if ( thisFormat.GetType() == wxDF_FILENAME )
                 {
                     // the data is D-normalized UTF8 strings of filenames delimited with \n

diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index 10faa7d10e74332649f526e7383be5c614802c3f..92c874aa26577de99bc670aac4abf682a9568f7e 100644 (file)
--- a/src/osx/core/hid.cpp
+++ b/src/osx/core/hid.cpp
@@ -378,7 +378,7 @@ bool wxHIDDevice::IsActive(int nIndex)
 // ----------------------------------------------------------------------------
 bool wxHIDDevice::HasElement(int nIndex)
 {
 // ----------------------------------------------------------------------------
 bool wxHIDDevice::HasElement(int nIndex)
 {

-    return (void*) m_pCookies[nIndex] != NULL;
+    return m_pCookies[nIndex] != 0;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------