Return smaller images for wxART_MENU/BUTTON under OS X.

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

diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp
index 55fb6f4178a28303e0e712227e3a90f152c4e911..549c81b17209fbe8ec9975435352de3a58025cb0 100644 (file)
--- a/src/osx/carbon/textctrl.cpp
+++ b/src/osx/carbon/textctrl.cpp
@@ -144,7 +144,7 @@ void* wxMacMPRemoteGUICall( classtype *object , void (classtype::*function)( con
 
 class WXDLLEXPORT wxMacPortSaver
 {
 
 class WXDLLEXPORT wxMacPortSaver
 {

-    DECLARE_NO_COPY_CLASS(wxMacPortSaver)
+    wxDECLARE_NO_COPY_CLASS(wxMacPortSaver);

 
 public:
     wxMacPortSaver( GrafPtr port );
 
 public:
     wxMacPortSaver( GrafPtr port );


@@ -160,7 +160,7 @@ private :
 
 class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
 {
 
 class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
 {

-    DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
+    wxDECLARE_NO_COPY_CLASS(wxMacWindowClipper);

 
 public:
     wxMacWindowClipper( const wxWindow* win );
 
 public:
     wxMacWindowClipper( const wxWindow* win );


@@ -223,7 +223,7 @@ class wxMacMLTEControl : public wxMacControl, public wxTextWidgetImpl
 public :
     wxMacMLTEControl( wxTextCtrl *peer ) ;
     ~wxMacMLTEControl() {}
 public :
     wxMacMLTEControl( wxTextCtrl *peer ) ;
     ~wxMacMLTEControl() {}

-    
+

     virtual bool        CanFocus() const
                         { return true; }
 
     virtual bool        CanFocus() const
                         { return true; }
 


@@ -234,7 +234,7 @@ public :
 
     void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
 
 
     void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
 

-    virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ;
+    virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle, bool ignoreBlack ) ;

     virtual void SetBackgroundColour(const wxColour& col );
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual void SetBackgroundColour(const wxColour& col );
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;


@@ -332,7 +332,7 @@ public :
         return true;
     }
 
         return true;
     }
 

-    virtual void            Move(int x, int y, int width, int height); 
+    virtual void            Move(int x, int y, int width, int height);

 
 protected :
     OSStatus                 DoCreate();
 
 protected :
     OSStatus                 DoCreate();


@@ -361,14 +361,14 @@ private :
     SInt32                  m_lastVerticalValue ;
 };
 
     SInt32                  m_lastVerticalValue ;
 };
 

-wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& str,
                                     const wxString& str,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
-                                    long extraStyle)
+                                    long style,
+                                    long WXUNUSED(extraStyle))

 {
     bool forceMLTE = false ;
 
 {
     bool forceMLTE = false ;
 


@@ -509,11 +509,12 @@ void wxMacUnicodeTextControl::InstallEventHandlers()
 {
     ::InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(),
                                 GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this,
 {
     ::InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(),
                                 GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this,

-                                NULL);
+                                (EventHandlerRef*) &m_macTextCtrlEventHandler);

 }
 
 wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
 {
 }
 
 wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
 {

+    ::RemoveEventHandler((EventHandlerRef) m_macTextCtrlEventHandler);

 }
 
 void wxMacUnicodeTextControl::VisibilityChanged(bool shown)
 }
 
 void wxMacUnicodeTextControl::VisibilityChanged(bool shown)


@@ -743,11 +744,11 @@ wxString wxMacMLTEControl::GetStringValue() const
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 wxMBConvUTF16 converter ;
                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;
                 (((UniChar*)*theText)[actualSize]) = 0 ;
                 wxMBConvUTF16 converter ;
                 size_t noChars = converter.MB2WC( NULL , (const char*)*theText , 0 ) ;

-                wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") );
+                wxASSERT_MSG( noChars != wxCONV_FAILED, wxT("Unable to count the number of characters in this string!") );

                 ptr = new wxChar[noChars + 1] ;
 
                 noChars = converter.MB2WC( ptr , (const char*)*theText , noChars + 1 ) ;
                 ptr = new wxChar[noChars + 1] ;
 
                 noChars = converter.MB2WC( ptr , (const char*)*theText , noChars + 1 ) ;

-                wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") );
+                wxASSERT_MSG( noChars != wxCONV_FAILED, wxT("Conversion of string failed!") );

                 ptr[noChars] = 0 ;
                 HUnlock( theText ) ;
 #endif
                 ptr[noChars] = 0 ;
                 HUnlock( theText ) ;
 #endif


@@ -892,7 +893,7 @@ void wxMacMLTEControl::AdjustCreationAttributes(const wxColour &background,
     } ;
 
     err = TXNSetTypeAttributes(
     } ;
 
     err = TXNSetTypeAttributes(

-        m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
+        m_txn, WXSIZEOF(typeAttr),

         typeAttr, kTXNStartOffset, kTXNEndOffset );
     verify_noerr( err );
 
         typeAttr, kTXNStartOffset, kTXNEndOffset );
     verify_noerr( err );
 


@@ -950,7 +951,7 @@ void wxMacMLTEControl::SetBackgroundColour(const wxColour& col )
 
 static inline int wxConvertToTXN(int x)
 {
 
 static inline int wxConvertToTXN(int x)
 {

-    return wx_static_cast(int, x / 254.0 * 72 + 0.5);
+    return static_cast<int>(x / 254.0 * 72 + 0.5);

 }
 
 void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to )
 }
 
 void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to )


@@ -1079,7 +1080,8 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
 
 void wxMacMLTEControl::SetFont(const wxFont & font,
                                const wxColour& foreground,
 
 void wxMacMLTEControl::SetFont(const wxFont & font,
                                const wxColour& foreground,

-                               long WXUNUSED(windowStyle))
+                               long WXUNUSED(windowStyle),
+                               bool WXUNUSED(ignoreBlack))

 {
     wxMacEditHelper help( m_txn ) ;
     TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ;
 {
     wxMacEditHelper help( m_txn ) ;
     TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ;


@@ -1123,6 +1125,15 @@ long wxMacMLTEControl::GetLastPosition() const
     wxTextPos actualsize = 0 ;
 
     Handle theText ;
     wxTextPos actualsize = 0 ;
 
     Handle theText ;

+#if wxUSE_UNICODE
+    OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNUnicodeTextData );
+    // all done
+    if ( err == noErr )
+    {
+        actualsize = GetHandleSize( theText )/sizeof(UniChar);
+        DisposeHandle( theText ) ;
+    }
+#else

     OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
 
     // all done
     OSErr err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
 
     // all done


@@ -1131,6 +1142,7 @@ long wxMacMLTEControl::GetLastPosition() const
         actualsize = GetHandleSize( theText ) ;
         DisposeHandle( theText ) ;
     }
         actualsize = GetHandleSize( theText ) ;
         DisposeHandle( theText ) ;
     }

+#endif

     else
     {
         actualsize = 0 ;
     else
     {
         actualsize = 0 ;


@@ -1359,7 +1371,7 @@ void wxMacMLTEControl::ShowPosition( long pos )
 
     // there will be an error returned for classic MLTE implementation when the control is
     // invisible, but HITextView works correctly, so we don't assert that one
 
     // there will be an error returned for classic MLTE implementation when the control is
     // invisible, but HITextView works correctly, so we don't assert that one

-    // wxASSERT_MSG( theErr == noErr, _T("TXNScroll returned an error!") );
+    // wxASSERT_MSG( theErr == noErr, wxT("TXNScroll returned an error!") );

 }
 
 void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end )
 }
 
 void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffset end )


@@ -1371,8 +1383,10 @@ void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffse
 #else
     wxMBConvUTF16 converter ;
     ByteCount byteBufferLen = converter.WC2MB( NULL, st.wc_str(), 0 ) ;
 #else
     wxMBConvUTF16 converter ;
     ByteCount byteBufferLen = converter.WC2MB( NULL, st.wc_str(), 0 ) ;

-    UniChar *unibuf = (UniChar*)malloc( byteBufferLen ) ;
-    converter.WC2MB( (char*)unibuf, st.wc_str(), byteBufferLen ) ;
+    wxASSERT_MSG( byteBufferLen != wxCONV_FAILED,
+                  wxT("Conversion to UTF-16 unexpectedly failed") );
+    UniChar *unibuf = (UniChar*)malloc( byteBufferLen + 2 ) ; // 2 for NUL in UTF-16
+    converter.WC2MB( (char*)unibuf, st.wc_str(), byteBufferLen + 2 ) ;

     TXNSetData( m_txn, kTXNUnicodeTextData, (void*)unibuf, byteBufferLen, start, end ) ;
     free( unibuf ) ;
 #endif
     TXNSetData( m_txn, kTXNUnicodeTextData, (void*)unibuf, byteBufferLen, start, end ) ;
     free( unibuf ) ;
 #endif


@@ -1718,7 +1732,7 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
     }
 }
 
     }
 }
 

-void wxMacMLTEClassicControl::Move(int x, int y, int width, int height) 
+void wxMacMLTEClassicControl::Move(int x, int y, int width, int height)

 {
     wxMacControl::Move(x,y,width,height) ;
     MacUpdatePosition() ;
 {
     wxMacControl::Move(x,y,width,height) ;
     MacUpdatePosition() ;


@@ -1907,6 +1921,7 @@ wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
         MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
         &bounds, featureSet, &m_controlRef );
     verify_noerr( err );
         MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
         &bounds, featureSet, &m_controlRef );
     verify_noerr( err );

+    SetControlReference( m_controlRef , (URefCon) wxPeer );

 
     DoCreate();
 
 
     DoCreate();