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

fixed compilation warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-03 00:44:10 +00:00
parent e24529d70d
commit eb7f8ac545
4 changed files with 116 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mac/carbon/dcprint.cpp
View File

@@ -117,8 +117,8 @@ bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED
if ( m_err != noErr )
return false;
m_maxX = rPage.right - rPage.left ;
m_maxY = rPage.bottom - rPage.top ;
m_maxX = (wxCoord)(rPage.right - rPage.left);
m_maxY = (wxCoord)(rPage.bottom - rPage.top);
return true ;
}
@@ -145,9 +145,9 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
if ( m_err == noErr )
{
m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
nil,
(void**) &dc->m_macPort );
m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
nil,
(void**) &dc->m_macPort );
}
if ( m_err != noErr )
@@ -162,8 +162,8 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
if ( !m_err )
{
dc->m_macLocalOrigin.x = rPage.left ;
dc->m_macLocalOrigin.y = rPage.top ;
dc->m_macLocalOrigin.x = (int) rPage.left;
dc->m_macLocalOrigin.y = (int) rPage.top;
}
// since this is a non-critical error, we set the flag back
m_err = noErr ;
@@ -317,7 +317,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
if ( !m_ok )
{
wxString message ;
message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ;
message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
dialog.ShowModal();
}
@@ -344,7 +344,7 @@ bool wxPrinterDC::StartDoc( const wxString& message )
if ( !m_ok )
{
wxString message ;
message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ;
message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
dialog.ShowModal();
}
@@ -363,7 +363,7 @@ void wxPrinterDC::EndDoc(void)
if ( !m_ok )
{
wxString message ;
message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ;
message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
dialog.ShowModal();
}

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

@@ -527,27 +527,33 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
{
if ( trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) == FALSE )
{
switch( result )
{
case wxDragCopy :
switch( result )
{
wxCursor cursor(wxCURSOR_COPY_ARROW) ;
cursor.MacInstall() ;
case wxDragCopy :
{
wxCursor cursor(wxCURSOR_COPY_ARROW) ;
cursor.MacInstall() ;
}
break ;
case wxDragMove :
{
wxCursor cursor(wxCURSOR_ARROW) ;
cursor.MacInstall() ;
}
break ;
case wxDragNone :
{
wxCursor cursor(wxCURSOR_NO_ENTRY) ;
cursor.MacInstall() ;
}
break ;
case wxDragError:
case wxDragLink:
case wxDragCancel:
// put these here to make gcc happy
;
}
break ;
case wxDragMove :
{
wxCursor cursor(wxCURSOR_ARROW) ;
cursor.MacInstall() ;
}
break ;
case wxDragNone :
{
wxCursor cursor(wxCURSOR_NO_ENTRY) ;
cursor.MacInstall() ;
}
break ;
}
}
}

20
src/mac/dcprint.cpp
View File

@@ -117,8 +117,8 @@ bool wxMacCarbonPrinterDC::StartDoc( wxPrinterDC* dc , const wxString& WXUNUSED
if ( m_err != noErr )
return false;
m_maxX = rPage.right - rPage.left ;
m_maxY = rPage.bottom - rPage.top ;
m_maxX = (wxCoord)(rPage.right - rPage.left);
m_maxY = (wxCoord)(rPage.bottom - rPage.top);
return true ;
}
@@ -145,9 +145,9 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
if ( m_err == noErr )
{
m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
nil,
(void**) &dc->m_macPort );
m_err = PMSessionGetGraphicsContext(native->m_macPrintSession,
nil,
(void**) &dc->m_macPort );
}
if ( m_err != noErr )
@@ -162,8 +162,8 @@ void wxMacCarbonPrinterDC::StartPage( wxPrinterDC* dc )
m_err = PMGetAdjustedPageRect(native->m_macPageFormat, &rPage);
if ( !m_err )
{
dc->m_macLocalOrigin.x = rPage.left ;
dc->m_macLocalOrigin.y = rPage.top ;
dc->m_macLocalOrigin.x = (int) rPage.left;
dc->m_macLocalOrigin.y = (int) rPage.top;
}
// since this is a non-critical error, we set the flag back
m_err = noErr ;
@@ -317,7 +317,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
if ( !m_ok )
{
wxString message ;
message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ;
message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
dialog.ShowModal();
}
@@ -344,7 +344,7 @@ bool wxPrinterDC::StartDoc( const wxString& message )
if ( !m_ok )
{
wxString message ;
message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ;
message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
dialog.ShowModal();
}
@@ -363,7 +363,7 @@ void wxPrinterDC::EndDoc(void)
if ( !m_ok )
{
wxString message ;
message.Printf( wxT("Print Error %ld"), m_nativePrinterDC->GetStatus() ) ;
message.Printf( wxT("Print Error %u"), m_nativePrinterDC->GetStatus() ) ;
wxMessageDialog dialog( NULL , message , wxEmptyString, wxICON_HAND | wxOK) ;
dialog.ShowModal();
}

44
src/mac/dnd.cpp
View File

@@ -527,27 +527,33 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
{
if ( trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) == FALSE )
{
switch( result )
{
case wxDragCopy :
switch( result )
{
wxCursor cursor(wxCURSOR_COPY_ARROW) ;
cursor.MacInstall() ;
case wxDragCopy :
{
wxCursor cursor(wxCURSOR_COPY_ARROW) ;
cursor.MacInstall() ;
}
break ;
case wxDragMove :
{
wxCursor cursor(wxCURSOR_ARROW) ;
cursor.MacInstall() ;
}
break ;
case wxDragNone :
{
wxCursor cursor(wxCURSOR_NO_ENTRY) ;
cursor.MacInstall() ;
}
break ;
case wxDragError:
case wxDragLink:
case wxDragCancel:
// put these here to make gcc happy
;
}
break ;
case wxDragMove :
{
wxCursor cursor(wxCURSOR_ARROW) ;
cursor.MacInstall() ;
}
break ;
case wxDragNone :
{
wxCursor cursor(wxCURSOR_NO_ENTRY) ;
cursor.MacInstall() ;
}
break ;
}
}
}