fix many mostly harmless warnings in wxOSX/Carbon build

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

include/wx/osx/dataview.h

@@ -74,7 +74,7 @@ public:
     return this->m_NativeDataPtr;
   }
 
-  virtual bool Render() = 0; // a call to the native data browser function to render the data;
+  virtual bool MacRender() = 0; // a call to the native data browser function to render the data;
                              // returns true if the data value could be rendered, false otherwise
 
   void SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr);
@@ -150,7 +150,7 @@ public:
 //
 // implementation
 //
-  virtual bool Render();
+  virtual bool MacRender();
 
   void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
 
@@ -184,7 +184,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
-  virtual bool Render();
+  virtual bool MacRender();
 
 protected:
 private:
@@ -222,7 +222,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
-  virtual bool Render();
+  virtual bool MacRender();
 
 protected:
 private:
@@ -247,7 +247,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
-  virtual bool Render();
+  virtual bool MacRender();
 
 //
 // implementation
@@ -283,7 +283,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
-  virtual bool Render();
+  virtual bool MacRender();
 
 protected:
 private:
@@ -302,7 +302,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
-  virtual bool Render();
+  virtual bool MacRender();
 
 protected:
 private:
@@ -322,7 +322,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
-  virtual bool Render();
+  virtual bool MacRender();
 
 protected:
 private:
@@ -341,7 +341,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
-  virtual bool Render();
+  virtual bool MacRender();
 
 protected:
 private:

src/common/imagtiff.cpp

@@ -312,7 +312,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
         return false;
     }
 
-    raster = (uint32*) _TIFFmalloc( bytesNeeded );
+    raster = (uint32*) _TIFFmalloc( (uint32)bytesNeeded );
 
     if (!raster)
     {

src/generic/datectlg.cpp

@@ -260,7 +260,7 @@ private:
 
         if (year_cnt == 1 && month_cnt == 1 && day_cnt == 1)
             return fmt;
-        else
+
         return x_format;
     }
 

src/osx/carbon/app.cpp

@@ -508,7 +508,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
         }
         else
         {
-            URefCon refCon = NULL ;
+            URefCon refCon = 0 ;
 
             GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
             itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;

src/osx/carbon/dataview.cpp

@@ -224,7 +224,7 @@ pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserCompareProc(ControlR
   if (ControlPtr != NULL)
     return ControlPtr->DataBrowserCompareProc(itemOneID,itemTwoID,sortProperty);
   else
-    return errDataBrowserPropertyNotSupported;
+    return FALSE;
 } /* wxMacDataBrowserTableViewControl::DataBrowserCompareProc(ControlRef, DataBrowserItemID, DataBrowserItemID, DataBrowserPropertyID) */
 
 pascal void wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc(ControlRef browser, MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* selection)
@@ -1189,7 +1189,10 @@ void wxMacDataViewDataBrowserListViewControl::Resort(void)
 //
 // other methods (inherited from wxDataViewWidgetImpl)
 //
-void wxMacDataViewDataBrowserListViewControl::HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
+void
+wxMacDataViewDataBrowserListViewControl::HitTest(const wxPoint& WXUNUSED(point),
+                                                 wxDataViewItem& item,
+                                                 wxDataViewColumn*& columnPtr) const
 {
  // not yet implemented:
   item = wxDataViewItem();
@@ -1388,7 +1391,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
       {
         dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItemDataRef(itemData);
         dataViewColumnPtr->GetRenderer()->SetValue(variant);
-        wxCHECK_MSG(dataViewColumnPtr->GetRenderer()->Render(),errDataBrowserNotConfigured,_("Rendering failed."));
+        wxCHECK_MSG(dataViewColumnPtr->GetRenderer()->MacRender(),errDataBrowserNotConfigured,_("Rendering failed."));
       }
       return noErr;
     }
@@ -1609,7 +1612,13 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
     }
 } /* wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */
 
-void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice)
+void
+wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID,
+        DataBrowserPropertyID propertyID,
+        DataBrowserItemState state,
+        Rect const* rectangle,
+        SInt16 WXUNUSED(bitDepth),
+        Boolean WXUNUSED(colorDevice))
 {
   DataBrowserTableViewColumnIndex columnIndex;
 
@@ -1709,7 +1718,13 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowse
   dataViewCustomRendererPtr->SetDC(NULL);
 } /* wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemState, Rect const*, SInt16, Boolean) */
 
-Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, CFStringRef theString, Rect* maxEditTextRect, Boolean* shrinkToFit)
+Boolean
+wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(
+    DataBrowserItemID WXUNUSED(itemID),
+    DataBrowserPropertyID WXUNUSED(propertyID),
+    CFStringRef WXUNUSED(theString),
+    Rect* WXUNUSED(maxEditTextRect),
+    Boolean* WXUNUSED(shrinkToFit))
 {
   return false;
 } /* wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID, DataBrowserPropertyID, CFStringRef, Rect*, Boolean*) */
@@ -2225,7 +2240,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype,
   this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCustomType));
 }
 
-bool wxDataViewCustomRenderer::Render()
+bool wxDataViewCustomRenderer::MacRender()
 {
   return true;
 }
@@ -2241,7 +2256,7 @@ wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const& varianttype, wxDa
   this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserTextType));
 }
 
-bool wxDataViewTextRenderer::Render()
+bool wxDataViewTextRenderer::MacRender()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << this->GetValue().GetType());
 
@@ -2260,7 +2275,7 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer(wxString const& varianttype,
   this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconType));
 }
 
-bool wxDataViewBitmapRenderer::Render()
+bool wxDataViewBitmapRenderer::MacRender()
  // This method returns 'true' if
  //  - the passed bitmap is valid and it could be assigned to the native data browser;
  //  - the passed bitmap is invalid (or is not initialized); this case simulates a non-existing bitmap.
@@ -2279,13 +2294,16 @@ IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
-wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
+    const wxString& varianttype,
+    wxDataViewCellMode mode,
+    int WXUNUSED(align))
                            :wxDataViewRenderer(varianttype,mode)
 {
   this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconAndTextType));
 }
 
-bool wxDataViewIconTextRenderer::Render()
+bool wxDataViewIconTextRenderer::MacRender()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Icon & text renderer cannot render value; value type: ")) << this->GetValue().GetType());
 
@@ -2307,13 +2325,16 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
 // ---------------------------------------------------------
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
-wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
+wxDataViewToggleRenderer::wxDataViewToggleRenderer(
+    const wxString& varianttype,
+    wxDataViewCellMode mode,
+    int WXUNUSED(align))
                          :wxDataViewRenderer(varianttype,mode)
 {
   this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCheckboxType));
 }
 
-bool wxDataViewToggleRenderer::Render()
+bool wxDataViewToggleRenderer::MacRender()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Toggle renderer cannot render value; value type: ")) << this->GetValue().GetType());
   return (::SetDataBrowserItemDataButtonValue(this->GetNativeData()->GetItemDataRef(),this->GetValue().GetBool()) == noErr);
@@ -2324,13 +2345,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------
-wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wxString const& varianttype, wxDataViewCellMode mode, int align)
+wxDataViewProgressRenderer::wxDataViewProgressRenderer(
+    const wxString& WXUNUSED(label),
+    wxString const& varianttype,
+    wxDataViewCellMode mode,
+    int align)
                            :wxDataViewRenderer(varianttype,mode,align)
 {
   this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserProgressBarType));
 }
 
-bool wxDataViewProgressRenderer::Render()
+bool wxDataViewProgressRenderer::MacRender()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Progress renderer cannot render value type; value type: ")) << this->GetValue().GetType());
   return ((::SetDataBrowserItemDataMinimum(this->GetNativeData()->GetItemDataRef(),  0)                        == noErr) &&
@@ -2349,7 +2374,7 @@ wxDataViewDateRenderer::wxDataViewDateRenderer(wxString const& varianttype, wxDa
   this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserDateTimeType));
 }
 
-bool wxDataViewDateRenderer::Render()
+bool wxDataViewDateRenderer::MacRender()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Date renderer cannot render value; value type: ")) << this->GetValue().GetType());
   return (::SetDataBrowserItemDataDateTime(this->GetNativeData()->GetItemDataRef(),this->GetValue().GetDateTime().Subtract(wxDateTime(1,wxDateTime::Jan,1904)).GetSeconds().GetLo()) == noErr);

src/osx/carbon/mediactrl.cpp

@@ -86,6 +86,11 @@ public:
 
     virtual bool Load(const wxString& fileName);
     virtual bool Load(const wxURI& location);
+    virtual bool Load(const wxURI& location,
+                      const wxURI& WXUNUSED(proxy))
+    {
+        return Load(location);
+    }
 
     virtual bool Play();
     virtual bool Pause();

src/osx/carbon/nonownedwnd.cpp

@@ -1646,9 +1646,9 @@ void wxNonOwnedWindowCarbonImpl::ScreenToWindow( int *x, int *y )
     HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ;
     HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
     if ( x )
-        *x = p.x;
+        *x = (int)p.x;
     if ( y )
-        *y = p.y;
+        *y = (int)p.y;
 }
 
 void wxNonOwnedWindowCarbonImpl::WindowToScreen( int *x, int *y )
@@ -1659,9 +1659,9 @@ void wxNonOwnedWindowCarbonImpl::WindowToScreen( int *x, int *y )
     HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ;
     HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
     if ( x )
-        *x = p.x;
+        *x = (int)p.x;
     if ( y )
-        *y = p.y;
+        *y = (int)p.y;
 }
 
 wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,

src/osx/carbon/window.cpp

@@ -940,7 +940,10 @@ void wxMacControl::GetContentArea(int &left , int &top , int &width , int &heigh
     {
         CGRect cgrect;
         HIShapeGetBounds(rgn, &cgrect);
-        content = (Rect){ cgrect.origin.y, cgrect.origin.x, cgrect.origin.y+cgrect.size.height, cgrect.origin.x+cgrect.size.width };
+        content = (Rect){ (short)cgrect.origin.y,
+                          (short)cgrect.origin.x,
+                          (short)(cgrect.origin.y+cgrect.size.height),
+                          (short)(cgrect.origin.x+cgrect.size.width) };
         CFRelease(rgn);
     }
     else

src/osx/cocoa/dataview.mm

@@ -1513,7 +1513,7 @@ wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(pare
   dataViewColumnPtr->GetRenderer()->GetNativeData()->SetColumnPtr(tableColumn);
   dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItem(item);
   dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItemCell(cell);
-  (void) dataViewColumnPtr->GetRenderer()->Render();
+  (void) dataViewColumnPtr->GetRenderer()->MacRender();
 }
 
 //
@@ -2106,7 +2106,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype,
   this->SetNativeData(new wxDataViewRendererNativeData([[wxCustomCell alloc] init]));
 }
 
-bool wxDataViewCustomRenderer::Render()
+bool wxDataViewCustomRenderer::MacRender()
 {
   [this->GetNativeData()->GetItemCell() setObjectValue:[[[wxCustomRendererObject alloc] initWithRenderer:this
                                                                                                     item:this->GetNativeData()->GetItem()
@@ -2132,7 +2132,7 @@ wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const& varianttype, wxDa
   [cell release];
 }
 
-bool wxDataViewTextRenderer::Render()
+bool wxDataViewTextRenderer::MacRender()
 {
   if (this->GetValue().GetType() == this->GetVariantType())
   {
@@ -2162,7 +2162,7 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer(wxString const& varianttype,
   [cell release];
 }
 
-bool wxDataViewBitmapRenderer::Render()
+bool wxDataViewBitmapRenderer::MacRender()
  // This method returns 'true' if
  //  - the passed bitmap is valid and it could be assigned to the native data browser;
  //  - the passed bitmap is invalid (or is not initialized); this case simulates a non-existing bitmap.
@@ -2198,7 +2198,7 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer(wxArrayString const& choices,
   [cell release];
 }
 
-bool wxDataViewChoiceRenderer::Render()
+bool wxDataViewChoiceRenderer::MacRender()
 {
   if (this->GetValue().GetType() == this->GetVariantType())
   {
@@ -2236,7 +2236,7 @@ wxDataViewDateRenderer::wxDataViewDateRenderer(wxString const& varianttype, wxDa
   [dateFormatter release];
 }
 
-bool wxDataViewDateRenderer::Render()
+bool wxDataViewDateRenderer::MacRender()
 {
   if (this->GetValue().GetType() == this->GetVariantType())
   {
@@ -2298,7 +2298,7 @@ wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& variantty
   [cell release];
 }
 
-bool wxDataViewIconTextRenderer::Render()
+bool wxDataViewIconTextRenderer::MacRender()
 {
   if (this->GetValue().GetType() == this->GetVariantType())
   {
@@ -2339,7 +2339,7 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype,
   [cell release];
 }
 
-bool wxDataViewToggleRenderer::Render()
+bool wxDataViewToggleRenderer::MacRender()
 {
   if (this->GetValue().GetType() == this->GetVariantType())
   {
@@ -2371,7 +2371,7 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wx
   [cell release];
 }
 
-bool wxDataViewProgressRenderer::Render()
+bool wxDataViewProgressRenderer::MacRender()
 {
   if (this->GetValue().GetType() == this->GetVariantType())
   {

src/osx/dataview_osx.cpp

@@ -626,7 +626,8 @@ void wxDataViewCtrl::FinishCustomItemEditing(void)
 }
 
 /*static*/
-wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+wxVisualAttributes
+wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
     wxVisualAttributes attr;