pen.h depends from brush.h in compat mode

[wxWidgets.git] / src / mac / carbon / textctrl.cpp

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 2d443c09b29309aca16f3ceca172c9d054fc3bb2..79c591439cd03e4706877389fe88e572a0682f2c 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -486,7 +486,7 @@ void wxTextCtrl::MacSuperChangedPosition()
 
 void wxTextCtrl::MacVisibilityChanged()
 {
 
 void wxTextCtrl::MacVisibilityChanged()
 {

-    GetPeer()->VisibilityChanged( IsShownOnScreen() ) ;
+    GetPeer()->VisibilityChanged( GetPeer()->IsVisible() );

 }
 
 void wxTextCtrl::MacCheckSpelling(bool check)
 }
 
 void wxTextCtrl::MacCheckSpelling(bool check)


@@ -1812,11 +1812,12 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
     TXNTab* tabs = NULL;
 
     bool relayout = false;
     TXNTab* tabs = NULL;
 
     bool relayout = false;

+    wxFont font ;

 
     if ( style.HasFont() )
     {
         wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );
 
     if ( style.HasFont() )
     {
         wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );

-        const wxFont &font = style.GetFont() ;
+        font = style.GetFont() ;

         typeAttr[typeAttrCount].tag = kTXNATSUIStyle ;
         typeAttr[typeAttrCount].size = kTXNATSUIStyleSize ;
         typeAttr[typeAttrCount].data.dataPtr = font.MacGetATSUStyle() ;
         typeAttr[typeAttrCount].tag = kTXNATSUIStyle ;
         typeAttr[typeAttrCount].size = kTXNATSUIStyleSize ;
         typeAttr[typeAttrCount].data.dataPtr = font.MacGetATSUStyle() ;