misc gcc compilation warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index fa729d693fb5f73fd707fe7ddd53b4dc1f765852..a9c7edd3b057c3d4784ea689e4b42d1eb3c4e923 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -1481,11 +1481,11 @@ void wxPageSetupDialogData::ConvertFromNative()
        OSStatus err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
     if ( err == noErr )
     {
        OSStatus err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
     if ( err == noErr )
     {

-           m_paperSize.x = ((double) rPaper.right - rPaper.left ) * pt2mm;
-           m_paperSize.y = ((double) rPaper.bottom - rPaper.top ) * pt2mm;
+           m_paperSize.x = (int)(((double) rPaper.right - rPaper.left ) * pt2mm);
+           m_paperSize.y = (int)(((double) rPaper.bottom - rPaper.top ) * pt2mm);

 
 

-           m_minMarginTopLeft.x = ((double) - rPaper.left ) * pt2mm;
-           m_minMarginTopLeft.y = ((double) - rPaper.top ) * pt2mm;
+           m_minMarginTopLeft.x = (int)(((double) - rPaper.left ) * 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.y = ((double)(**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom ) * 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;

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index f4e41ae710a7e1a2511e1c01270d2fc785c8234e..b417d0fd9f371c1c4aa59bf395441d39dbbc5ccf 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -432,7 +432,7 @@ int wxFileDialog::ShowModal()
                {
                        mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
                        myData.menuitems = mNavOptions.popupExtension ;
                {
                        mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
                        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].menuCreator = 'WXNG' ;
                        {
                            (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
                            (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 343420363ca17e040c31599b02c612f6fd27af06..5c3dc855d0687f45cd9614cd1fe2db37328014b5 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -224,7 +224,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;

-       SInt16 fontNum ;

 #if TARGET_CARBON
        GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 #else
 #if TARGET_CARBON
        GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 #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() ;
 

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 2f8f53b786566e1cf45d5484979d7414e27f54ce..908cef7b5f8b7aa1c578b544616f870643d94227 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -355,7 +355,6 @@ void wxNotebook::MacSetupTabs()
     wxNotebookPage *page;
     ControlTabInfoRec info;
 
     wxNotebookPage *page;
     ControlTabInfoRec info;
 

-    OSStatus err = noErr ;

     for(int ii = 0; ii < GetPageCount(); ii++)
     {
         page = m_pages[ii];
     for(int ii = 0; ii < GetPageCount(); ii++)
     {
         page = m_pages[ii];

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index cee43bf68b07968b5df663e20b249826486e12f5..05da8899acc4328d36f1c045165fcf17bc20d47b 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1542,9 +1542,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
          key == WXK_DELETE || 
          key == WXK_BACK)
     {
          key == WXK_DELETE || 
          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.SetEventObject( this );
         wxPostEvent(GetEventHandler(),event1);
         event1.SetString( GetValue() ) ;
         event1.SetEventObject( this );
         wxPostEvent(GetEventHandler(),event1);

diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index f4e41ae710a7e1a2511e1c01270d2fc785c8234e..b417d0fd9f371c1c4aa59bf395441d39dbbc5ccf 100644 (file)
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -432,7 +432,7 @@ int wxFileDialog::ShowModal()
                {
                        mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
                        myData.menuitems = mNavOptions.popupExtension ;
                {
                        mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
                        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].menuCreator = 'WXNG' ;
                        {
                            (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
                            (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 343420363ca17e040c31599b02c612f6fd27af06..5c3dc855d0687f45cd9614cd1fe2db37328014b5 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -224,7 +224,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;

-       SInt16 fontNum ;

 #if TARGET_CARBON
        GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 #else
 #if TARGET_CARBON
        GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 #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() ;
 

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index 2f8f53b786566e1cf45d5484979d7414e27f54ce..908cef7b5f8b7aa1c578b544616f870643d94227 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -355,7 +355,6 @@ void wxNotebook::MacSetupTabs()
     wxNotebookPage *page;
     ControlTabInfoRec info;
 
     wxNotebookPage *page;
     ControlTabInfoRec info;
 

-    OSStatus err = noErr ;

     for(int ii = 0; ii < GetPageCount(); ii++)
     {
         page = m_pages[ii];
     for(int ii = 0; ii < GetPageCount(); ii++)
     {
         page = m_pages[ii];

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index cee43bf68b07968b5df663e20b249826486e12f5..05da8899acc4328d36f1c045165fcf17bc20d47b 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -1542,9 +1542,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
          key == WXK_DELETE || 
          key == WXK_BACK)
     {
          key == WXK_DELETE || 
          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.SetEventObject( this );
         wxPostEvent(GetEventHandler(),event1);
         event1.SetString( GetValue() ) ;
         event1.SetEventObject( this );
         wxPostEvent(GetEventHandler(),event1);