minor compilation warning corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ba2928c6fa
commit
0cd51b2d27
@ -220,9 +220,9 @@ bool wxClipboard::AddData( wxDataObject *data )
|
|||||||
array[i].GetId().c_str() );
|
array[i].GetId().c_str() );
|
||||||
|
|
||||||
#if !TARGET_CARBON
|
#if !TARGET_CARBON
|
||||||
OSErr err = noErr ;
|
OSErr err = noErr ;
|
||||||
#else
|
#else
|
||||||
OSStatus err = noErr ;
|
OSStatus err = noErr ;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
switch ( array[i].GetType() )
|
switch ( array[i].GetType() )
|
||||||
|
@ -473,7 +473,7 @@ void wxControl::DoSetSize(int x, int y,
|
|||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
Rect oldbounds, newbounds;
|
Rect oldbounds;
|
||||||
int new_x, new_y, new_width, new_height;
|
int new_x, new_y, new_width, new_height;
|
||||||
int mac_x, mac_y;
|
int mac_x, mac_y;
|
||||||
|
|
||||||
|
@ -52,8 +52,6 @@ const double RAD2DEG = 180.0 / M_PI;
|
|||||||
const short kEmulatedMode = -1 ;
|
const short kEmulatedMode = -1 ;
|
||||||
const short kUnsupportedMode = -2 ;
|
const short kUnsupportedMode = -2 ;
|
||||||
|
|
||||||
#define wxMAC_EXPERIMENTAL_PATTERN 0
|
|
||||||
|
|
||||||
wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
|
wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
|
||||||
m_ph( (GrafPtr) dc->m_macPort )
|
m_ph( (GrafPtr) dc->m_macPort )
|
||||||
{
|
{
|
||||||
|
@ -86,7 +86,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
|
|||||||
|
|
||||||
if ( data )
|
if ( data )
|
||||||
{
|
{
|
||||||
int formatcount = data->GetFormatCount() ;
|
size_t formatcount = data->GetFormatCount() ;
|
||||||
wxDataFormat *array = new wxDataFormat[ formatcount ];
|
wxDataFormat *array = new wxDataFormat[ formatcount ];
|
||||||
data->GetAllFormats( array );
|
data->GetAllFormats( array );
|
||||||
for (size_t i = 0; !supported && i < formatcount ; i++)
|
for (size_t i = 0; !supported && i < formatcount ; i++)
|
||||||
@ -142,7 +142,7 @@ bool wxDropTarget::GetData()
|
|||||||
|
|
||||||
if ( data )
|
if ( data )
|
||||||
{
|
{
|
||||||
int formatcount = data->GetFormatCount() ;
|
size_t formatcount = data->GetFormatCount() ;
|
||||||
wxDataFormat *array = new wxDataFormat[ formatcount ];
|
wxDataFormat *array = new wxDataFormat[ formatcount ];
|
||||||
data->GetAllFormats( array );
|
data->GetAllFormats( array );
|
||||||
for (size_t i = 0; !transferred && i < formatcount ; i++)
|
for (size_t i = 0; !transferred && i < formatcount ; i++)
|
||||||
@ -272,7 +272,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
|
|||||||
OSErr result;
|
OSErr result;
|
||||||
DragReference theDrag;
|
DragReference theDrag;
|
||||||
RgnHandle dragRegion;
|
RgnHandle dragRegion;
|
||||||
if (result = NewDrag(&theDrag))
|
if ((result = NewDrag(&theDrag)))
|
||||||
{
|
{
|
||||||
return wxDragNone ;
|
return wxDragNone ;
|
||||||
}
|
}
|
||||||
@ -281,7 +281,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
|
|||||||
wxDataFormat *formats = new wxDataFormat[formatCount] ;
|
wxDataFormat *formats = new wxDataFormat[formatCount] ;
|
||||||
m_data->GetAllFormats( formats ) ;
|
m_data->GetAllFormats( formats ) ;
|
||||||
ItemReference theItem = 1 ;
|
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] ) ;
|
size_t dataSize = m_data->GetDataSize( formats[i] ) ;
|
||||||
Ptr dataPtr = new char[dataSize] ;
|
Ptr dataPtr = new char[dataSize] ;
|
||||||
@ -396,7 +396,6 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
|
|||||||
MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
|
MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
|
||||||
Point mouse, localMouse;
|
Point mouse, localMouse;
|
||||||
DragAttributes attributes;
|
DragAttributes attributes;
|
||||||
RgnHandle hiliteRgn;
|
|
||||||
GetDragAttributes(theDrag, &attributes);
|
GetDragAttributes(theDrag, &attributes);
|
||||||
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
|
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
|
||||||
switch(theMessage)
|
switch(theMessage)
|
||||||
|
@ -220,9 +220,9 @@ bool wxClipboard::AddData( wxDataObject *data )
|
|||||||
array[i].GetId().c_str() );
|
array[i].GetId().c_str() );
|
||||||
|
|
||||||
#if !TARGET_CARBON
|
#if !TARGET_CARBON
|
||||||
OSErr err = noErr ;
|
OSErr err = noErr ;
|
||||||
#else
|
#else
|
||||||
OSStatus err = noErr ;
|
OSStatus err = noErr ;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
switch ( array[i].GetType() )
|
switch ( array[i].GetType() )
|
||||||
|
@ -473,7 +473,7 @@ void wxControl::DoSetSize(int x, int y,
|
|||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
Rect oldbounds, newbounds;
|
Rect oldbounds;
|
||||||
int new_x, new_y, new_width, new_height;
|
int new_x, new_y, new_width, new_height;
|
||||||
int mac_x, mac_y;
|
int mac_x, mac_y;
|
||||||
|
|
||||||
|
@ -52,8 +52,6 @@ const double RAD2DEG = 180.0 / M_PI;
|
|||||||
const short kEmulatedMode = -1 ;
|
const short kEmulatedMode = -1 ;
|
||||||
const short kUnsupportedMode = -2 ;
|
const short kUnsupportedMode = -2 ;
|
||||||
|
|
||||||
#define wxMAC_EXPERIMENTAL_PATTERN 0
|
|
||||||
|
|
||||||
wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
|
wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
|
||||||
m_ph( (GrafPtr) dc->m_macPort )
|
m_ph( (GrafPtr) dc->m_macPort )
|
||||||
{
|
{
|
||||||
|
@ -86,7 +86,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
|
|||||||
|
|
||||||
if ( data )
|
if ( data )
|
||||||
{
|
{
|
||||||
int formatcount = data->GetFormatCount() ;
|
size_t formatcount = data->GetFormatCount() ;
|
||||||
wxDataFormat *array = new wxDataFormat[ formatcount ];
|
wxDataFormat *array = new wxDataFormat[ formatcount ];
|
||||||
data->GetAllFormats( array );
|
data->GetAllFormats( array );
|
||||||
for (size_t i = 0; !supported && i < formatcount ; i++)
|
for (size_t i = 0; !supported && i < formatcount ; i++)
|
||||||
@ -142,7 +142,7 @@ bool wxDropTarget::GetData()
|
|||||||
|
|
||||||
if ( data )
|
if ( data )
|
||||||
{
|
{
|
||||||
int formatcount = data->GetFormatCount() ;
|
size_t formatcount = data->GetFormatCount() ;
|
||||||
wxDataFormat *array = new wxDataFormat[ formatcount ];
|
wxDataFormat *array = new wxDataFormat[ formatcount ];
|
||||||
data->GetAllFormats( array );
|
data->GetAllFormats( array );
|
||||||
for (size_t i = 0; !transferred && i < formatcount ; i++)
|
for (size_t i = 0; !transferred && i < formatcount ; i++)
|
||||||
@ -272,7 +272,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
|
|||||||
OSErr result;
|
OSErr result;
|
||||||
DragReference theDrag;
|
DragReference theDrag;
|
||||||
RgnHandle dragRegion;
|
RgnHandle dragRegion;
|
||||||
if (result = NewDrag(&theDrag))
|
if ((result = NewDrag(&theDrag)))
|
||||||
{
|
{
|
||||||
return wxDragNone ;
|
return wxDragNone ;
|
||||||
}
|
}
|
||||||
@ -281,7 +281,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
|
|||||||
wxDataFormat *formats = new wxDataFormat[formatCount] ;
|
wxDataFormat *formats = new wxDataFormat[formatCount] ;
|
||||||
m_data->GetAllFormats( formats ) ;
|
m_data->GetAllFormats( formats ) ;
|
||||||
ItemReference theItem = 1 ;
|
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] ) ;
|
size_t dataSize = m_data->GetDataSize( formats[i] ) ;
|
||||||
Ptr dataPtr = new char[dataSize] ;
|
Ptr dataPtr = new char[dataSize] ;
|
||||||
@ -396,7 +396,6 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
|
|||||||
MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
|
MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
|
||||||
Point mouse, localMouse;
|
Point mouse, localMouse;
|
||||||
DragAttributes attributes;
|
DragAttributes attributes;
|
||||||
RgnHandle hiliteRgn;
|
|
||||||
GetDragAttributes(theDrag, &attributes);
|
GetDragAttributes(theDrag, &attributes);
|
||||||
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
|
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
|
||||||
switch(theMessage)
|
switch(theMessage)
|
||||||
|
Loading…
Reference in New Issue
Block a user