unload msimg32.dll earlier (before static cleanup time) to avoid lockups when wx...

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 9f8e83ee04100bbad7455d5925cc31d776672766..84caa012ba45ddfd2021eda25f7aab397005a6b5 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -416,10 +416,6 @@ void wxTextCtrl::MacVisibilityChanged()
     GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
 }
 
     GetPeer()->VisibilityChanged( MacIsReallyShown() ) ;
 }
 

-void wxTextCtrl::MacEnabledStateChanged()
-{
-}
-

 void wxTextCtrl::MacCheckSpelling(bool check)
 {
     GetPeer()->CheckSpelling(check);
 void wxTextCtrl::MacCheckSpelling(bool check)
 {
     GetPeer()->CheckSpelling(check);


@@ -1689,7 +1685,7 @@ void wxMacMLTEControl::AdjustCreationAttributes(const wxColour &background,
 
     TXNBackground tback;
     tback.bgType = kTXNBackgroundTypeRGB;
 
     TXNBackground tback;
     tback.bgType = kTXNBackgroundTypeRGB;

-    tback.bg.color = MAC_WXCOLORREF( background.GetPixel() );
+    background.GetRGBColor( &tback.bg.color );

     TXNSetBackground( m_txn , &tback );
 
 
     TXNSetBackground( m_txn , &tback );
 
 


@@ -1730,7 +1726,7 @@ void wxMacMLTEControl::SetBackground( const wxBrush &brush )
     TXNBackground tback;
 
     tback.bgType = kTXNBackgroundTypeRGB;
     TXNBackground tback;
 
     tback.bgType = kTXNBackgroundTypeRGB;

-    tback.bg.color = MAC_WXCOLORREF( brush.GetColour().GetPixel() );
+    brush.GetColour().GetRGBColor(&tback.bg.color);

     TXNSetBackground( m_txn , &tback );
 }
 
     TXNSetBackground( m_txn , &tback );
 }
 


@@ -1767,8 +1763,7 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
     if ( style.HasTextColour() )
     {
         wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );
     if ( style.HasTextColour() )
     {
         wxASSERT( typeAttrCount < WXSIZEOF(typeAttr) );

-        color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
-
+        style.GetTextColour().GetRGBColor( &color );

         typeAttr[typeAttrCount].tag = kTXNQDFontColorAttribute ;
         typeAttr[typeAttrCount].size = kTXNQDFontColorAttributeSize ;
         typeAttr[typeAttrCount].data.dataPtr = (void*) &color ;
         typeAttr[typeAttrCount].tag = kTXNQDFontColorAttribute ;
         typeAttr[typeAttrCount].size = kTXNQDFontColorAttributeSize ;
         typeAttr[typeAttrCount].data.dataPtr = (void*) &color ;


@@ -3048,7 +3043,8 @@ void wxMacMLTEHIViewControl::SetBackground( const wxBrush &brush )
 
 #if 0
     CGColorSpaceRef rgbSpace = CGColorSpaceCreateDeviceRGB();
 
 #if 0
     CGColorSpaceRef rgbSpace = CGColorSpaceCreateDeviceRGB();

-    RGBColor col = MAC_WXCOLORREF(brush.GetColour().GetPixel()) ;
+    RGBColor col;
+    brush.GetColour().GetRGBColor(&col) ;

 
     float component[4] ;
     component[0] = col.red / 65536.0 ;
 
     float component[4] ;
     component[0] = col.red / 65536.0 ;