Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-09-21 09:28:39 +00:00
parent cdbd62d6ff
commit 59576592b8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/dataobj.h
View File

@@ -24,7 +24,7 @@ public:
#endif #endif
virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; 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 // returns true if the passed in format is present in the pasteboard
static bool IsFormatInPasteboard( void * pasteboardRef, const wxDataFormat &dataFormat ); 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 any of the accepted formats of this dataobj is in the pasteboard

4
src/osx/carbon/dataobj.cpp
View File

@@ -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; PasteboardRef pasteboard = (PasteboardRef) pb;
// get formats from wxDataObjects // get formats from wxDataObjects
@@ -301,7 +301,7 @@ void wxDataObject::AddToPasteboard( void * pb, int itemID )
memset( buf, 0, sz ); memset( buf, 0, sz );
if ( GetDataHere( thisFormat, buf ) ) if ( GetDataHere( thisFormat, buf ) )
{ {
int counter = 1 ; wxIntPtr counter = 1 ;
if ( thisFormat.GetType() == wxDF_FILENAME ) if ( thisFormat.GetType() == wxDF_FILENAME )
{ {
// the data is D-normalized UTF8 strings of filenames delimited with \n // the data is D-normalized UTF8 strings of filenames delimited with \n

2
src/osx/core/hid.cpp
View File

@@ -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;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------