include changes

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 2ca3e8cc2bec759f095533a783490ed7811e2dad..4fe99c0e6a8d7ce5eac08d6cc0df0177b2f3aad1 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -379,7 +379,7 @@ GrafPtr             UMAGetWindowPort( WindowRef inWindowRef )
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 

-       return GetWindowPort( inWindowRef ) ; 
+       return (GrafPtr) GetWindowPort( inWindowRef ) ; 

 #else
        return (GrafPtr) inWindowRef ;
 #endif
 #else
        return (GrafPtr) inWindowRef ;
 #endif

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 2ca3e8cc2bec759f095533a783490ed7811e2dad..4fe99c0e6a8d7ce5eac08d6cc0df0177b2f3aad1 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -379,7 +379,7 @@ GrafPtr             UMAGetWindowPort( WindowRef inWindowRef )
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 

-       return GetWindowPort( inWindowRef ) ; 
+       return (GrafPtr) GetWindowPort( inWindowRef ) ; 

 #else
        return (GrafPtr) inWindowRef ;
 #endif
 #else
        return (GrafPtr) inWindowRef ;
 #endif