misc gcc compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
14ac4f3c54
commit
7baf4bdbb6
@ -1481,11 +1481,11 @@ void wxPageSetupDialogData::ConvertFromNative()
|
|||||||
OSStatus err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
|
OSStatus err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
|
||||||
if ( err == noErr )
|
if ( err == noErr )
|
||||||
{
|
{
|
||||||
m_paperSize.x = ((double) rPaper.right - rPaper.left ) * pt2mm;
|
m_paperSize.x = (int)(((double) rPaper.right - rPaper.left ) * pt2mm);
|
||||||
m_paperSize.y = ((double) rPaper.bottom - rPaper.top ) * pt2mm;
|
m_paperSize.y = (int)(((double) rPaper.bottom - rPaper.top ) * pt2mm);
|
||||||
|
|
||||||
m_minMarginTopLeft.x = ((double) - rPaper.left ) * pt2mm;
|
m_minMarginTopLeft.x = (int)(((double) - rPaper.left ) * pt2mm);
|
||||||
m_minMarginTopLeft.y = ((double) - rPaper.top ) * pt2mm;
|
m_minMarginTopLeft.y = (int)(((double) - rPaper.top ) * pt2mm);
|
||||||
|
|
||||||
// m_minMarginBottomRight.x = ((double) rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right ) * pt2mm;
|
// m_minMarginBottomRight.x = ((double) rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right ) * pt2mm;
|
||||||
// m_minMarginBottomRight.y = ((double)(**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom ) * pt2mm;
|
// m_minMarginBottomRight.y = ((double)(**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom ) * pt2mm;
|
||||||
|
@ -432,7 +432,7 @@ int wxFileDialog::ShowModal()
|
|||||||
{
|
{
|
||||||
mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
|
mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
|
||||||
myData.menuitems = mNavOptions.popupExtension ;
|
myData.menuitems = mNavOptions.popupExtension ;
|
||||||
for ( int i = 0 ; i < myData.extensions.GetCount() ; ++i )
|
for ( size_t i = 0 ; i < myData.extensions.GetCount() ; ++i )
|
||||||
{
|
{
|
||||||
(*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
|
(*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
|
||||||
(*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
|
(*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
|
||||||
|
@ -224,7 +224,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
Str255 fontName ;
|
Str255 fontName ;
|
||||||
SInt16 fontSize ;
|
SInt16 fontSize ;
|
||||||
Style fontStyle ;
|
Style fontStyle ;
|
||||||
SInt16 fontNum ;
|
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
|
GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
|
||||||
#else
|
#else
|
||||||
@ -650,7 +649,6 @@ wxSize wxListBox::DoGetBestSize() const
|
|||||||
|
|
||||||
{
|
{
|
||||||
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
|
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
|
||||||
Rect drawRect ;
|
|
||||||
|
|
||||||
wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
|
wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
|
||||||
|
|
||||||
|
@ -355,7 +355,6 @@ void wxNotebook::MacSetupTabs()
|
|||||||
wxNotebookPage *page;
|
wxNotebookPage *page;
|
||||||
ControlTabInfoRec info;
|
ControlTabInfoRec info;
|
||||||
|
|
||||||
OSStatus err = noErr ;
|
|
||||||
for(int ii = 0; ii < GetPageCount(); ii++)
|
for(int ii = 0; ii < GetPageCount(); ii++)
|
||||||
{
|
{
|
||||||
page = m_pages[ii];
|
page = m_pages[ii];
|
||||||
|
@ -1542,9 +1542,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
|
|||||||
key == WXK_DELETE ||
|
key == WXK_DELETE ||
|
||||||
key == WXK_BACK)
|
key == WXK_BACK)
|
||||||
{
|
{
|
||||||
long t1 = 0xDEADBEEF ;
|
|
||||||
wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
|
wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
|
||||||
long t2 = 0xDEADBEEF ;
|
|
||||||
event1.SetString( GetValue() ) ;
|
event1.SetString( GetValue() ) ;
|
||||||
event1.SetEventObject( this );
|
event1.SetEventObject( this );
|
||||||
wxPostEvent(GetEventHandler(),event1);
|
wxPostEvent(GetEventHandler(),event1);
|
||||||
|
@ -432,7 +432,7 @@ int wxFileDialog::ShowModal()
|
|||||||
{
|
{
|
||||||
mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
|
mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
|
||||||
myData.menuitems = mNavOptions.popupExtension ;
|
myData.menuitems = mNavOptions.popupExtension ;
|
||||||
for ( int i = 0 ; i < myData.extensions.GetCount() ; ++i )
|
for ( size_t i = 0 ; i < myData.extensions.GetCount() ; ++i )
|
||||||
{
|
{
|
||||||
(*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
|
(*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
|
||||||
(*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
|
(*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
|
||||||
|
@ -224,7 +224,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
Str255 fontName ;
|
Str255 fontName ;
|
||||||
SInt16 fontSize ;
|
SInt16 fontSize ;
|
||||||
Style fontStyle ;
|
Style fontStyle ;
|
||||||
SInt16 fontNum ;
|
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
|
GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
|
||||||
#else
|
#else
|
||||||
@ -650,7 +649,6 @@ wxSize wxListBox::DoGetBestSize() const
|
|||||||
|
|
||||||
{
|
{
|
||||||
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
|
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
|
||||||
Rect drawRect ;
|
|
||||||
|
|
||||||
wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
|
wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
|
||||||
|
|
||||||
|
@ -355,7 +355,6 @@ void wxNotebook::MacSetupTabs()
|
|||||||
wxNotebookPage *page;
|
wxNotebookPage *page;
|
||||||
ControlTabInfoRec info;
|
ControlTabInfoRec info;
|
||||||
|
|
||||||
OSStatus err = noErr ;
|
|
||||||
for(int ii = 0; ii < GetPageCount(); ii++)
|
for(int ii = 0; ii < GetPageCount(); ii++)
|
||||||
{
|
{
|
||||||
page = m_pages[ii];
|
page = m_pages[ii];
|
||||||
|
@ -1542,9 +1542,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
|
|||||||
key == WXK_DELETE ||
|
key == WXK_DELETE ||
|
||||||
key == WXK_BACK)
|
key == WXK_BACK)
|
||||||
{
|
{
|
||||||
long t1 = 0xDEADBEEF ;
|
|
||||||
wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
|
wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
|
||||||
long t2 = 0xDEADBEEF ;
|
|
||||||
event1.SetString( GetValue() ) ;
|
event1.SetString( GetValue() ) ;
|
||||||
event1.SetEventObject( this );
|
event1.SetEventObject( this );
|
||||||
wxPostEvent(GetEventHandler(),event1);
|
wxPostEvent(GetEventHandler(),event1);
|
||||||
|
Loading…
Reference in New Issue
Block a user