mozilla fixes

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 68a62c217c20be23aa4745ae4bd977bca67ae35e..6a9fa8e53ede1dc85aed6938c018fc42355875b6 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -555,6 +555,7 @@ void UMAActivateControl( ControlHandle inControl )
 void UMADrawControl( ControlHandle inControl )
 {
     WindowRef theWindow = GetControlOwner(inControl) ;
 void UMADrawControl( ControlHandle inControl )
 {
     WindowRef theWindow = GetControlOwner(inControl) ;

+    wxMacPortStateHelper help( (GrafPtr) GetWindowPort(theWindow) ) ;

     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( theWindow , updateRgn ) ;
     Point zero = { 0 , 0 } ;
     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( theWindow , updateRgn ) ;
     Point zero = { 0 , 0 } ;


@@ -646,6 +647,7 @@ OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
 // events
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
 {
 // events
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
 {

+    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) inWindow) ) ;

     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( inWindow , updateRgn ) ;
 
     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( inWindow , updateRgn ) ;
 


@@ -746,6 +748,7 @@ void wxMacPortStateHelper::Setup( GrafPtr newport )
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;

+    SetOrigin(0,0);

     wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
     m_clip = NewRgn() ;
     GetClip( m_clip );
     wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
     m_clip = NewRgn() ;
     GetClip( m_clip );

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 68a62c217c20be23aa4745ae4bd977bca67ae35e..6a9fa8e53ede1dc85aed6938c018fc42355875b6 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -555,6 +555,7 @@ void UMAActivateControl( ControlHandle inControl )
 void UMADrawControl( ControlHandle inControl )
 {
     WindowRef theWindow = GetControlOwner(inControl) ;
 void UMADrawControl( ControlHandle inControl )
 {
     WindowRef theWindow = GetControlOwner(inControl) ;

+    wxMacPortStateHelper help( (GrafPtr) GetWindowPort(theWindow) ) ;

     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( theWindow , updateRgn ) ;
     Point zero = { 0 , 0 } ;
     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( theWindow , updateRgn ) ;
     Point zero = { 0 , 0 } ;


@@ -646,6 +647,7 @@ OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
 // events
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
 {
 // events
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
 {

+    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) inWindow) ) ;

     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( inWindow , updateRgn ) ;
 
     RgnHandle updateRgn = NewRgn() ;
     GetWindowUpdateRgn( inWindow , updateRgn ) ;
 


@@ -746,6 +748,7 @@ void wxMacPortStateHelper::Setup( GrafPtr newport )
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;
 {
     GetPort( &m_oldPort ) ;
     SetPort( newport ) ;

+    SetOrigin(0,0);

     wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
     m_clip = NewRgn() ;
     GetClip( m_clip );
     wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
     m_clip = NewRgn() ;
     GetClip( m_clip );