From af4fc79bd48fa3fedecc6a8fa7969c59a99bb381 Mon Sep 17 00:00:00 2001
From: Ryan Norton <wxprojects@comcast.net>
Date: Fri, 24 Sep 2004 21:33:21 +0000
Subject: [PATCH] partial aggregate warning fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/utils.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 679bf3d1e5..cf7d76b624 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -1706,7 +1706,9 @@ void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to
 void wxMacControl::SetRect( Rect *r ) 
 {
 #if TARGET_API_MAC_OSX
-    HIRect hir = { r->left , r->top , r->right - r->left , r->bottom - r->top } ;
+	//A HIRect is actually a CGRect on OSX - which consists of two structures -
+	//CGPoint and CGSize, which have two floats each
+    HIRect hir = { { r->left , r->top }, { r->right - r->left , r->bottom - r->top } } ;
     HIViewSetFrame ( m_controlRef , &hir ) ;
 #else
     SetControlBounds( m_controlRef , r ) ;
-- 
2.45.2