AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor compilation warning corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot 2002-03-26 20:18:36 +00:00
parent ba2928c6fa
commit 0cd51b2d27
8 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/clipbrd.cpp
View File

@ -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() )

2
src/mac/carbon/control.cpp
View File

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

2
src/mac/carbon/dc.cpp
View File

@ -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 )
{

9
src/mac/carbon/dnd.cpp
View File

@ -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)

4
src/mac/clipbrd.cpp
View File

@ -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() )

2
src/mac/control.cpp
View File

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

2
src/mac/dc.cpp
View File

@ -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 )
{

9
src/mac/dnd.cpp
View File

@ -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)