]> git.saurik.com Git - wxWidgets.git/commitdiff
avoiding a -1,-1 being set as icon size
authorStefan Csomor <csomor@advancedconcepts.ch>
Sat, 10 Nov 2007 20:36:22 +0000 (20:36 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Sat, 10 Nov 2007 20:36:22 +0000 (20:36 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/icon.cpp

index ee61c69a8daacceac8cb19ce6ea7307a789dc235..3457355e0c0e27fe3d8c9da6b8e5b6f29d3bb9f5 100644 (file)
@@ -61,8 +61,11 @@ wxIcon::wxIcon(WXHICON icon, const wxSize& size)
         AcquireIconRef( (IconRef) icon ) ;
 
     m_refData = new wxIconRefData( icon ) ;
-    M_ICONDATA->SetWidth( size.x ) ;
-    M_ICONDATA->SetHeight( size.y ) ;
+    if ( (size.x != -1) && (size.y != -1) )
+    {
+        M_ICONDATA->SetWidth( size.x ) ;
+        M_ICONDATA->SetHeight( size.y ) ;
+    }
 }
 
 wxIcon::~wxIcon()