/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/mac/carbon/textctrl.cpp
// Purpose: wxTextCtrl
// Author: Stefan Csomor
// Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
#if wxUSE_TEXTCTRL
+#include "wx/textctrl.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/dc.h"
+ #include "wx/button.h"
+ #include "wx/menu.h"
+ #include "wx/settings.h"
+ #include "wx/msgdlg.h"
+ #include "wx/toplevel.h"
+#endif
#ifdef __DARWIN__
- #include <sys/types.h>
- #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
#else
- #include <stat.h>
+ #include <stat.h>
#endif
-#include "wx/msgdlg.h"
-
#if wxUSE_STD_IOSTREAM
#if wxUSE_IOSTREAMH
#include <fstream.h>
#endif
#endif
-#include "wx/app.h"
-#include "wx/dc.h"
-#include "wx/button.h"
-#include "wx/toplevel.h"
-#include "wx/textctrl.h"
-#include "wx/settings.h"
#include "wx/filefn.h"
-#include "wx/utils.h"
#include "wx/sysopt.h"
-#include "wx/menu.h"
-#include "wx/intl.h"
#if defined(__BORLANDC__) && !defined(__WIN32__)
- #include <alloc.h>
#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__DARWIN__)
- #include <malloc.h>
+ #include <malloc.h>
#endif
#ifndef __DARWIN__
#ifndef __WXMAC_OSX__
enum
{
- kTXNVisibilityTag = 'visb' // set the visibility state of the object
+ kTXNVisibilityTag = 'visb' // set the visibility state of the object
};
#endif
virtual void* operator()() = 0 ;
- static void* CallBackProc(void *param)
+ static void* CallBackProc( void *param )
{
wxMacFunctor* f = (wxMacFunctor*) param ;
void *result = (*f)() ;
m_param1 = p1 ;
}
- ~wxMacObjectFunctor1() {}
+ virtual ~wxMacObjectFunctor1() {}
virtual void* operator()()
{
- (m_object->*m_function)(m_param1) ;
+ (m_object->*m_function)( m_param1 ) ;
return NULL ;
}
{
public :
wxMacTextControl( wxTextCtrl *peer ) ;
- ~wxMacTextControl() ;
+ virtual ~wxMacTextControl() ;
virtual wxString GetStringValue() const = 0 ;
virtual void SetStringValue( const wxString &val ) = 0 ;
- virtual void SetStyle(long start, long end, const wxTextAttr& style) ;
+ virtual void SetSelection( long from, long to ) = 0 ;
+ virtual void GetSelection( long* from, long* to ) const = 0 ;
+ virtual void WriteText( const wxString& str ) = 0 ;
+
+ virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
virtual void Copy() ;
virtual void Cut() ;
virtual void Paste() ;
virtual bool CanPaste() const ;
- virtual void SetEditable(bool editable) ;
+ virtual void SetEditable( bool editable ) ;
virtual wxTextPos GetLastPosition() const ;
- virtual void Replace( long from , long to , const wxString &str ) ;
- virtual void Remove( long from , long to ) ;
- virtual void SetSelection( long from , long to ) = 0 ;
- virtual void GetSelection( long* from, long* to) const = 0 ;
- virtual void WriteText(const wxString& str) = 0 ;
+ virtual void Replace( long from, long to, const wxString &str ) ;
+ virtual void Remove( long from, long to ) ;
+
virtual bool HasOwnContextMenu() const
{ return false ; }
virtual int GetNumberOfLines() const ;
virtual long XYToPosition(long x, long y) const;
virtual bool PositionToXY(long pos, long *x, long *y) const ;
- virtual void ShowPosition( long WXUNUSED(pos) ) ;
+ virtual void ShowPosition(long WXUNUSED(pos)) ;
virtual int GetLineLength(long lineNo) const ;
virtual wxString GetLineText(long lineNo) const ;
{
public :
wxMacMLTEControl( wxTextCtrl *peer ) ;
+
virtual wxString GetStringValue() const ;
- virtual void SetStringValue( const wxString &str) ;
+ virtual void SetStringValue( const wxString &str ) ;
static TXNFrameOptions FrameOptionsFromWXStyle( long wxStyle ) ;
- 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 SetBackground( const wxBrush &brush) ;
- virtual void SetStyle(long start, long end, const wxTextAttr& style) ;
+ virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ;
+ virtual void SetBackground( const wxBrush &brush ) ;
+ virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
virtual void Copy() ;
virtual void Cut() ;
virtual void Paste() ;
virtual bool CanPaste() const ;
- virtual void SetEditable(bool editable) ;
+ virtual void SetEditable( bool editable ) ;
virtual wxTextPos GetLastPosition() const ;
- virtual void Replace( long from , long to , const wxString &str ) ;
- virtual void Remove( long from , long to ) ;
- virtual void GetSelection( long* from, long* to) const ;
- virtual void SetSelection( long from , long to ) ;
+ virtual void Replace( long from, long to, const wxString &str ) ;
+ virtual void Remove( long from, long to ) ;
+ virtual void GetSelection( long* from, long* to ) const ;
+ virtual void SetSelection( long from, long to ) ;
- virtual void WriteText(const wxString& str) ;
+ virtual void WriteText( const wxString& str ) ;
virtual bool HasOwnContextMenu() const
{
virtual wxString GetLineText(long lineNo) const ;
void SetTXNData( const wxString& st , TXNOffset start , TXNOffset end ) ;
+ TXNObject GetTXNObject() { return m_txn ; }
protected :
void TXNSetAttribute( const wxTextAttr& style , long from , long to ) ;
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style ) ;
+ virtual ~wxMacMLTEHIViewControl() ;
+
virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
virtual bool HasFocus() const ;
virtual void SetBackground( const wxBrush &brush) ;
protected :
HIViewRef m_scrollView ;
HIViewRef m_textView ;
+ EventHandlerRef m_textEventHandlerRef ;
};
#endif
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style ) ;
- ~wxMacUnicodeTextControl();
+ virtual ~wxMacUnicodeTextControl();
virtual void VisibilityChanged(bool shown);
virtual wxString GetStringValue() const ;
protected :
// contains the tag for the content (is different for password and non-password controls)
OSType m_valueTag ;
+
+ // as the selection tag only works correctly when the control has the focus we have to mirror the
+ // intended value
+ EventHandlerRef m_focusHandlerRef ;
+public :
+ ControlEditTextSelectionRec m_selection ;
};
#endif
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style ) ;
- ~wxMacMLTEClassicControl() ;
+ virtual ~wxMacMLTEClassicControl() ;
+
virtual void VisibilityChanged(bool shown) ;
virtual void SuperChangedPosition() ;
virtual wxInt16 MacControlUserPaneFocusProc(wxInt16 action) ;
virtual void MacControlUserPaneBackgroundProc(void* info) ;
- virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) ) { MacControlUserPaneIdleProc() ; return true ;}
+ virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) )
+ {
+ MacControlUserPaneIdleProc();
+ return true;
+ }
virtual void SetRect( Rect *r ) ;
#endif
};
-#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
-
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_ERASE_BACKGROUND( wxTextCtrl::OnEraseBackground )
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
EVT_CHAR(wxTextCtrl::OnChar)
END_EVENT_TABLE()
-// Text item
void wxTextCtrl::Init()
{
m_editable = true ;
m_dirty = false;
+ m_maxLength = 0;
m_privateContextMenu = NULL;
-
- m_maxLength = TE_UNLIMITED_LENGTH ;
+ m_triggerOnSetValue = true ;
}
wxTextCtrl::~wxTextCtrl()
delete m_privateContextMenu;
}
-bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
- const wxString& str,
- const wxPoint& pos,
- const wxSize& size, long style,
- const wxValidator& validator,
- const wxString& name)
+bool wxTextCtrl::Create( wxWindow *parent,
+ wxWindowID id,
+ const wxString& str,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name )
{
m_macIsUserPane = false ;
m_editable = true ;
- if ( ! ( style & wxNO_BORDER) )
- style = ( style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
+ if ( ! (style & wxNO_BORDER) )
+ style = (style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
- if ( !wxTextCtrlBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
+ if ( !wxTextCtrlBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )
return false;
if ( m_windowStyle & wxTE_MULTILINE )
{
- wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
- wxT("wxTE_PROCESS_ENTER style is ignored for multiline text controls (they always process it)") );
-
+ // always turn on this style for multi-line controls
m_windowStyle |= wxTE_PROCESS_ENTER;
style |= wxTE_PROCESS_ENTER ;
}
bool forceMLTE = false ;
#if wxUSE_SYSTEM_OPTIONS
- if ( (wxSystemOptions::HasOption(wxMAC_TEXTCONTROL_USE_MLTE) ) && ( wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1) )
+ if (wxSystemOptions::HasOption( wxMAC_TEXTCONTROL_USE_MLTE ) && (wxSystemOptions::GetOptionInt( wxMAC_TEXTCONTROL_USE_MLTE ) == 1))
{
forceMLTE = true ;
}
#ifdef __WXMAC_OSX__
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
- if ( UMAGetSystemVersion() >= 0x1030 && forceMLTE == false )
+ if ( UMAGetSystemVersion() >= 0x1030 && !forceMLTE )
{
if ( m_windowStyle & wxTE_MULTILINE )
m_peer = new wxMacMLTEHIViewControl( this , str , pos , size , style ) ;
if ( !m_peer )
{
- if ( !(m_windowStyle & wxTE_MULTILINE) && forceMLTE == false )
+ if ( !(m_windowStyle & wxTE_MULTILINE) && !forceMLTE )
m_peer = new wxMacUnicodeTextControl( this , str , pos , size , style ) ;
}
#endif
if ( !m_peer )
- {
m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ;
- }
- MacPostControlCreate(pos,size) ;
+ MacPostControlCreate(pos, size) ;
// only now the embedding is correct and we can do a positioning update
if ( GetValue() == str )
return ;
- GetPeer()->SetStringValue(str) ;
+ GetPeer()->SetStringValue( str ) ;
- wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
- event.SetString( GetValue() ) ;
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ if ( m_triggerOnSetValue )
+ {
+ wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
+ event.SetString( GetValue() );
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( event );
+ }
}
void wxTextCtrl::SetMaxLength(unsigned long len)
{
GetPeer()->Cut() ;
- wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+ wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ GetEventHandler()->ProcessEvent( event );
}
}
// TODO: eventually we should add setting the default style again
- wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+ wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ GetEventHandler()->ProcessEvent( event );
}
}
{
// Can copy if there's a selection
long from, to;
- GetSelection(& from, & to);
+ GetSelection( &from, &to );
+
return (from != to);
}
bool wxTextCtrl::CanCut() const
{
if ( !IsEditable() )
- return false ;
+ return false;
// Can cut if there's a selection
long from, to;
- GetSelection(& from, & to);
+ GetSelection( &from, &to );
+
return (from != to);
}
void wxTextCtrl::SetInsertionPointEnd()
{
wxTextPos pos = GetLastPosition();
- SetInsertionPoint(pos);
+ SetInsertionPoint( pos );
}
long wxTextCtrl::GetInsertionPoint() const
{
- long begin,end ;
+ long begin, end ;
GetSelection( &begin , &end ) ;
+
return begin ;
}
wxTextPos wxTextCtrl::GetLastPosition() const
{
- return GetPeer()->GetLastPosition( ) ;
+ return GetPeer()->GetLastPosition() ;
}
void wxTextCtrl::Replace(long from, long to, const wxString& str)
{
- GetPeer()->Replace( from , to , str) ;
+ GetPeer()->Replace( from , to , str ) ;
}
void wxTextCtrl::Remove(long from, long to)
GetPeer()->SetSelection( from , to ) ;
}
-bool wxTextCtrl::LoadFile(const wxString& file)
-{
- if ( wxTextCtrlBase::LoadFile(file) )
- return true;
-
- return false;
-}
-
void wxTextCtrl::WriteText(const wxString& str)
{
// TODO: this MPRemoting will be moved into a remoting peer proxy for any command
// unfortunately CW 8 is not able to correctly deduce the template types,
// so we have to instantiate explicitly
wxMacMPRemoteGUICall<wxTextCtrl,wxString>( this , &wxTextCtrl::WriteText , str ) ;
+
return ;
}
- else
- {
- GetPeer()->WriteText( str ) ;
- }
+
+ GetPeer()->WriteText( str ) ;
}
void wxTextCtrl::AppendText(const wxString& text)
{
SetInsertionPointEnd();
- WriteText(text);
+ WriteText( text );
}
void wxTextCtrl::Clear()
wxSize wxTextCtrl::DoGetBestSize() const
{
- int wText = 100 ;
-
- int hText;
+ int wText, hText;
// these are the numbers from the HIG:
// we reduce them by the borders first
+ wText = 100 ;
switch ( m_windowVariant )
{
break ;
case wxWINDOW_VARIANT_MINI :
- hText= 15 - 6 ;
+ hText = 15 - 6 ;
break ;
default :
bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
{
- return GetPeer()->PositionToXY(pos , x , y ) ;
+ return GetPeer()->PositionToXY( pos , x , y ) ;
}
void wxTextCtrl::ShowPosition(long pos)
void wxTextCtrl::Command(wxCommandEvent & event)
{
- SetValue (event.GetString());
- ProcessCommand (event);
+ SetValue(event.GetString());
+ ProcessCommand(event);
}
void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
{
// By default, load the first file into the text window.
if (event.GetNumberOfFiles() > 0)
- LoadFile(event.GetFiles()[0]);
+ LoadFile( event.GetFiles()[0] );
}
void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
int key = event.GetKeyCode() ;
bool eat_key = false ;
+ if ( key == 'a' && event.MetaDown() )
+ {
+ SelectAll() ;
+
+ return ;
+ }
+
if ( key == 'c' && event.MetaDown() )
{
if ( CanCopy() )
}
if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&
- !( key == WXK_RETURN && ( (m_windowStyle & wxPROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
-// && key != WXK_PRIOR && key != WXK_NEXT && key != WXK_HOME && key != WXK_END
+ !( key == WXK_RETURN && ( (m_windowStyle & wxTE_PROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
+// && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END
)
{
// eat it
return ;
}
- // Check if we have reached the max # of chars, but still allow navigation and deletion
- if ( !IsMultiLine() && GetValue().Length() >= m_maxLength &&
+ // Check if we have reached the max # of chars (if it is set), but still
+ // allow navigation and deletion
+ if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&
key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB &&
- key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxPROCESS_ENTER) )
+ key != WXK_BACK && !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) )
)
{
// eat it, we don't want to add more than allowed # of characters
+
+ // TODO: generate EVT_TEXT_MAXLEN()
return;
}
switch ( key )
{
case WXK_RETURN:
- if (m_windowStyle & wxPROCESS_ENTER)
+ if (m_windowStyle & wxTE_PROCESS_ENTER)
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
event.SetEventObject( this );
if ( !(m_windowStyle & wxTE_MULTILINE) )
{
- wxWindow *parent = GetParent();
- while ( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
- {
- parent = parent->GetParent() ;
- }
-
- if ( parent && parent->GetDefaultItem() )
+ wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+ if ( tlw && tlw->GetDefaultItem() )
{
- wxButton *def = wxDynamicCast(parent->GetDefaultItem(), wxButton);
+ wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
if ( def && def->IsEnabled() )
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
// This is necessary (don't know why);
// otherwise the tab will not be inserted.
WriteText(wxT("\t"));
+ eat_key = true;
}
break;
if (!eat_key)
{
// perform keystroke handling
- if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
- CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
- else
- {
- EventRecord rec ;
- if ( wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) )
- {
- EventRecord *ev = &rec ;
- short keycode, keychar ;
- keychar = short(ev->message & charCodeMask);
- keycode = short(ev->message & keyCodeMask) >> 8 ;
-
- m_peer->HandleKey( keycode , keychar , ev->modifiers ) ;
- }
- }
+ event.Skip(true) ;
}
if ( ( key >= 0x20 && key < WXK_START ) ||
+ ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||
key == WXK_RETURN ||
key == WXK_DELETE ||
key == WXK_BACK)
{
wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
event1.SetEventObject( this );
- wxPostEvent(GetEventHandler(),event1);
+ wxPostEvent( GetEventHandler(), event1 );
}
}
void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event))
{
long from, to;
- GetSelection(& from, & to);
+
+ GetSelection( &from, &to );
if (from != -1 && to != -1)
- Remove(from, to);
+ Remove( from, to );
}
void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event)
{
long from, to;
- GetSelection(& from, & to);
+
+ GetSelection( &from, &to );
event.Enable( from != -1 && to != -1 && from != to && IsEditable() ) ;
}
wxTextPos wxMacTextControl::GetLastPosition() const
{
- return GetStringValue().Length() ;
+ return GetStringValue().length() ;
}
void wxMacTextControl::Replace( long from , long to , const wxString &val )
wxString content = GetStringValue() ;
lines = 1;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (content[i] == '\r')
lines++;
// Find line first
int count = 0;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (count == lineNo)
{
// Add chars in line then
wxString tmp;
- for (size_t j = i; j < content.Length(); j++)
+ for (size_t j = i; j < content.length(); j++)
{
if (content[j] == '\n')
return tmp;
// Find line first
int count = 0;
- for (size_t i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.length() ; i++)
{
if (count == lineNo)
{
// Count chars in line then
count = 0;
- for (size_t j = i; j < content.Length(); j++)
+ for (size_t j = i; j < content.length(); j++)
{
count++;
if (content[j] == '\n')
#if TARGET_API_MAC_OSX
+// the current unicode textcontrol implementation has a bug : only if the control
+// is currently having the focus, the selection can be retrieved by the corresponding
+// data tag. So we have a mirroring using a member variable
+// TODO : build event table using virtual member functions for wxMacControl
+
+static const EventTypeSpec unicodeTextControlEventList[] =
+{
+ { kEventClassControl , kEventControlSetFocusPart } ,
+} ;
+
+static pascal OSStatus wxMacUnicodeTextControlControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+ wxMacUnicodeTextControl* focus = (wxMacUnicodeTextControl*) data ;
+ wxMacCarbonEvent cEvent( event ) ;
+
+ switch ( GetEventKind( event ) )
+ {
+ case kEventControlSetFocusPart :
+ {
+ ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+ if ( controlPart == kControlFocusNoPart )
+ {
+ // about to loose focus -> store selection to field
+ focus->GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &focus->m_selection );
+ }
+ result = CallNextEventHandler(handler,event) ;
+ if ( controlPart != kControlFocusNoPart )
+ {
+ // about to gain focus -> set selection from field
+ focus->SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &focus->m_selection );
+ }
+ break;
+ }
+ default:
+ break ;
+ }
+
+ return result ;
+}
+
+static pascal OSStatus wxMacUnicodeTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+
+ switch ( GetEventClass( event ) )
+ {
+ case kEventClassControl :
+ result = wxMacUnicodeTextControlControlEventHandler( handler , event , data ) ;
+ break ;
+
+ default :
+ break ;
+ }
+ return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacUnicodeTextControlEventHandler )
+
wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
- const wxString& str,
- const wxPoint& pos,
- const wxSize& size, long style ) : wxMacTextControl( wxPeer )
+ const wxString& str,
+ const wxPoint& pos,
+ const wxSize& size, long style )
+ : wxMacTextControl( wxPeer )
{
m_font = wxPeer->GetFont() ;
m_windowStyle = style ;
CFStringRef cfr = cf ;
Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
m_valueTag = isPassword ? kControlEditTextPasswordCFStringTag : kControlEditTextCFStringTag ;
- CreateEditUnicodeTextControl(
+
+ OSStatus err = CreateEditUnicodeTextControl(
MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr ,
isPassword , NULL , &m_controlRef ) ;
+ verify_noerr( err );
if ( !(m_windowStyle & wxTE_MULTILINE) )
SetData<Boolean>( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ;
+
+ InstallControlEventHandler( m_controlRef , GetwxMacUnicodeTextControlEventHandlerUPP(),
+ GetEventTypeCount(unicodeTextControlEventList), unicodeTextControlEventList, this,
+ &m_focusHandlerRef);
}
wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
{
+ ::RemoveEventHandler( m_focusHandlerRef );
}
void wxMacUnicodeTextControl::VisibilityChanged(bool shown)
CFStringRef value = NULL ;
verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) );
- verify_noerr( GetData<CFStringRef>( 0, m_valueTag , &value ) );
+ verify_noerr( GetData<CFStringRef>( 0, m_valueTag, &value ) );
verify_noerr( SetData<CFStringRef>( 0, m_valueTag, &value ) );
verify_noerr( SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) );
wxString wxMacUnicodeTextControl::GetStringValue() const
{
wxString result ;
- CFStringRef value = GetData<CFStringRef>(0,m_valueTag) ;
+ CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
if ( value )
{
wxMacCFStringHolder cf(value) ;
return result ;
}
-void wxMacUnicodeTextControl::SetStringValue( const wxString &str)
+void wxMacUnicodeTextControl::SetStringValue( const wxString &str )
{
wxString st = str ;
wxMacConvertNewlines10To13( &st ) ;
- wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
+ wxMacCFStringHolder cf( st , m_font.GetEncoding() ) ;
verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;
}
void wxMacUnicodeTextControl::SetEditable(bool editable)
{
- SetData<Boolean>( 0 , kControlEditTextLockedTag , (Boolean) !editable ) ;
+#if 0 // leads to problem because text cannot be selected anymore
+ SetData<Boolean>( kControlEditTextPart , kControlEditTextLockedTag , (Boolean) !editable ) ;
+#endif
}
void wxMacUnicodeTextControl::GetSelection( long* from, long* to ) const
{
ControlEditTextSelectionRec sel ;
- verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ) ;
+ if (HasFocus())
+ verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ) ;
+ else
+ sel = m_selection ;
+
if ( from )
*from = sel.selStart ;
if ( to )
void wxMacUnicodeTextControl::SetSelection( long from , long to )
{
ControlEditTextSelectionRec sel ;
+ wxString result ;
+ int textLength = 0 ;
+ CFStringRef value = GetData<CFStringRef>(0, m_valueTag) ;
+ if ( value )
+ {
+ wxMacCFStringHolder cf(value) ;
+ textLength = cf.AsString().length() ;
+ }
+
if ((from == -1) && (to == -1))
{
from = 0 ;
- to = 32767 ; // sel has 16 bit signed values, max is 32767
+ to = textLength ;
+ }
+ else
+ {
+ from = wxMin(textLength,wxMax(from,0)) ;
+ to = wxMax(0,wxMin(textLength,to)) ;
}
sel.selStart = from ;
sel.selEnd = to ;
- SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ;
+ if ( HasFocus() )
+ SetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ;
+ else
+ m_selection = sel;
}
-void wxMacUnicodeTextControl::WriteText(const wxString& str)
+void wxMacUnicodeTextControl::WriteText( const wxString& str )
{
wxString st = str ;
wxMacConvertNewlines10To13( &st ) ;
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ if ( HasFocus() )
+ {
wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
CFStringRef value = cf ;
SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
-#else
+ }
+ else
+#endif
+ {
wxString val = GetStringValue() ;
long start , end ;
GetSelection( &start , &end ) ;
val.Remove( start , end - start ) ;
val.insert( start , str ) ;
SetStringValue( val ) ;
- SetSelection( start + str.Length() , start + str.Length() ) ;
-#endif
+ SetSelection( start + str.length() , start + str.length() ) ;
+ }
}
#endif
TXNControlData m_data[1] ;
} ;
-wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer ) : wxMacTextControl( peer )
+wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer )
+ : wxMacTextControl( peer )
{
SetNeedsFocusRect( true ) ;
}
wxString result ;
OSStatus err ;
Size actualSize = 0;
+
{
#if wxUSE_UNICODE
Handle theText ;
- err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText , kTXNUnicodeTextData );
+ err = TXNGetDataEncoded( m_txn, kTXNStartOffset, kTXNEndOffset, &theText, kTXNUnicodeTextData );
// all done
if ( err != noErr )
}
else
{
- actualSize = GetHandleSize( theText ) / sizeof( UniChar) ;
+ actualSize = GetHandleSize( theText ) / sizeof(UniChar) ;
if ( actualSize > 0 )
{
wxChar *ptr = NULL ;
#if SIZEOF_WCHAR_T == 2
- ptr = new wxChar[actualSize + 1 ] ;
- wxStrncpy( ptr , (wxChar*) *theText , actualSize ) ;
+ ptr = new wxChar[actualSize + 1] ;
+ wxStrncpy( ptr , (wxChar*)(*theText) , actualSize ) ;
#else
- SetHandleSize( theText , ( actualSize + 1 ) * sizeof( UniChar ) ) ;
+ SetHandleSize( theText, (actualSize + 1) * sizeof(UniChar) ) ;
HLock( theText ) ;
(((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!") );
ptr = new wxChar[noChars + 1] ;
- noChars = converter.MB2WC( ptr , (const char*)*theText , noChars ) ;
+ noChars = converter.MB2WC( ptr , (const char*)*theText , noChars + 1 ) ;
+ wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") );
ptr[noChars] = 0 ;
HUnlock( theText ) ;
#endif
ptr[actualSize] = 0 ;
result = wxString( ptr ) ;
- delete[] ptr ;
+ delete [] ptr ;
}
DisposeHandle( theText ) ;
}
#else
Handle theText ;
- err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
+ err = TXNGetDataEncoded( m_txn , kTXNStartOffset, kTXNEndOffset, &theText, kTXNTextData );
// all done
if ( err != noErr )
void wxMacMLTEControl::SetStringValue( const wxString &str )
{
- wxString st = str ;
+ wxString st = str;
+ wxMacConvertNewlines10To13( &st );
- wxMacConvertNewlines10To13( &st ) ;
{
- wxMacWindowClipper c( m_peer ) ;
+ wxMacWindowClipper c( m_peer );
{
- wxMacEditHelper help(m_txn) ;
- SetTXNData( st , kTXNStartOffset, kTXNEndOffset ) ;
+ wxMacEditHelper help( m_txn );
+ SetTXNData( st, kTXNStartOffset, kTXNEndOffset );
}
TXNSetSelection( m_txn, 0, 0 );
TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
{
- TXNFrameOptions frameOptions =
- kTXNDontDrawCaretWhenInactiveMask
+ TXNFrameOptions frameOptions = kTXNDontDrawCaretWhenInactiveMask;
+
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
- | kTXNDoFontSubstitutionMask
+ frameOptions |= kTXNDoFontSubstitutionMask;
#endif
- ;
- if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
+ if ( ! (wxStyle & wxTE_NOHIDESEL) )
frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
+ if ( wxStyle & (wxHSCROLL | wxTE_DONTWRAP) )
+ frameOptions |= kTXNWantHScrollBarMask ;
+
if ( wxStyle & wxTE_MULTILINE )
{
- if ( ! ( wxStyle & wxTE_DONTWRAP ) )
- frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
- else
- {
- frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
- frameOptions |= kTXNWantHScrollBarMask ;
- }
+ frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
- if ( !(wxStyle & wxTE_NO_VSCROLL ) )
+ if ( !(wxStyle & wxTE_NO_VSCROLL) )
{
frameOptions |= kTXNWantVScrollBarMask ;
- if ( frameOptions & kTXNWantHScrollBarMask )
- frameOptions |= kTXNDrawGrowIconMask ;
+
+ // The following code causes drawing problems on 10.4. Perhaps it can be restored for
+ // older versions of the OS, but I'm not sure it's appropriate to put a grow icon here
+ // anyways, as AFAIK users can't actually use it to resize the text ctrl.
+// if ( frameOptions & kTXNWantHScrollBarMask )
+// frameOptions |= kTXNDrawGrowIconMask ;
}
}
else
+ {
frameOptions |= kTXNSingleLineOnlyMask ;
-
- if ( wxStyle & wxHSCROLL )
- frameOptions |= kTXNWantHScrollBarMask ;
+ }
return frameOptions ;
}
};
TXNControlData iControlData[] =
{
- {true},
- {kTXNNoAutoWrap},
+ { true },
+ { kTXNNoAutoWrap },
};
int toptag = WXSIZEOF( iControlTags ) ;
if ( m_windowStyle & wxTE_MULTILINE )
{
- if (m_windowStyle & wxTE_DONTWRAP)
- iControlData[1].uValue = kTXNNoAutoWrap ;
- else
- iControlData[1].uValue = kTXNAutoWrap ;
+ iControlData[1].uValue =
+ (m_windowStyle & wxTE_DONTWRAP)
+ ? kTXNNoAutoWrap
+ : kTXNAutoWrap;
}
- verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData )) ;
+ OSStatus err = TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) ;
+ verify_noerr( err );
// setting the default font:
// under 10.2 this causes a visible caret, therefore we avoid it
SInt16 fontSize ;
Style fontStyle ;
- GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+ GetThemeFont( kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
TXNTypeAttributes typeAttr[] =
{
- { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
- { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
- { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } ,
+ { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
+ { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
+ { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } ,
} ;
- verify_noerr( TXNSetTypeAttributes (m_txn, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr,
- kTXNStartOffset,
- kTXNEndOffset) );
+ err = TXNSetTypeAttributes(
+ m_txn, sizeof(typeAttr) / sizeof(TXNTypeAttributes),
+ typeAttr, kTXNStartOffset, kTXNEndOffset );
+ verify_noerr( err );
}
if ( m_windowStyle & wxTE_PASSWORD )
{
- UniChar c = 0xA5 ;
- verify_noerr(TXNEchoMode( m_txn , c , 0 , true )) ;
+ UniChar c = 0x00A5 ;
+ err = TXNEchoMode( m_txn , c , 0 , true );
+ verify_noerr( err );
}
TXNBackground tback;
void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , long to )
{
TXNTypeAttributes typeAttr[4] ;
- Str255 fontName = "\pMonaco" ;
- SInt16 fontSize = 12 ;
- Style fontStyle = normal ;
RGBColor color ;
int attrCount = 0 ;
if ( style.HasFont() )
{
const wxFont &font = style.GetFont() ;
+
+#if 0 // old version
+ Str255 fontName = "\pMonaco" ;
+ SInt16 fontSize = 12 ;
+ Style fontStyle = normal ;
wxMacStringToPascal( font.GetFaceName() , fontName ) ;
fontSize = font.GetPointSize() ;
if ( font.GetUnderlined() )
typeAttr[attrCount].size = kTXNQDFontStyleAttributeSize ;
typeAttr[attrCount].data.dataValue = fontStyle ;
attrCount++ ;
+#else
+ typeAttr[attrCount].tag = kTXNATSUIStyle ;
+ typeAttr[attrCount].size = kTXNATSUIStyleSize ;
+ typeAttr[attrCount].data.dataValue = (UInt32)font.MacGetATSUStyle() ;
+ attrCount++ ;
+#endif
}
if ( style.HasTextColour() )
if ( attrCount > 0 )
{
verify_noerr( TXNSetTypeAttributes( m_txn , attrCount , typeAttr, from , to ) );
+ // unfortunately the relayout is not automatic
+ TXNRecalcTextLayout( m_txn );
}
}
{
TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
- TXNSetTXNObjectControls( m_txn , false , WXSIZEOF(tag) , tag , data ) ;
+ TXNSetTXNObjectControls( m_txn, false, WXSIZEOF(tag), tag, data ) ;
}
wxTextPos wxMacMLTEControl::GetLastPosition() const
TXNShowSelection( m_txn, kTXNShowStart );
}
-void wxMacMLTEControl::WriteText(const wxString& str)
+void wxMacMLTEControl::WriteText( const wxString& str )
{
wxString st = str ;
wxMacConvertNewlines10To13( &st ) ;
{
wxMacEditHelper helper( m_txn ) ;
- SetTXNData( st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
+ SetTXNData( st, kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
}
- GetSelection( &dummy , &end ) ;
+ GetSelection( &dummy, &end ) ;
// TODO: SetStyle( start , end , GetDefaultStyle() ) ;
}
wxMacWindowClipper c( m_peer ) ;
wxMacEditHelper st( m_txn ) ;
TXNSetSelection( m_txn , kTXNStartOffset , kTXNEndOffset ) ;
- TXNClear(m_txn);
+ TXNClear( m_txn ) ;
}
bool wxMacMLTEControl::CanUndo() const
// line metrics of a certain line, we don't get its starting
// position, so it would probably be rather a binary search
// for the start position
- long xpos = 0 ;
- long ypos = 0 ;
+ long xpos = 0, ypos = 0 ;
int lastHeight = 0 ;
ItemCount n ;
if ( y == ypos && x == xpos )
return n ;
- TXNOffsetToPoint( m_txn , n , &curpt );
+ TXNOffsetToPoint( m_txn, n, &curpt ) ;
if ( curpt.v > lastHeight )
{
return 0 ;
}
-bool wxMacMLTEControl::PositionToXY(long pos, long *x, long *y) const
+bool wxMacMLTEControl::PositionToXY( long pos, long *x, long *y ) const
{
Point curpt ;
wxTextPos lastpos ;
lastpos = GetLastPosition() ;
if ( pos <= lastpos )
{
- // TODO: find a better implementation : while we can get the
+ // TODO: find a better implementation - while we can get the
// line metrics of a certain line, we don't get its starting
// position, so it would probably be rather a binary search
// for the start position
for ( n = 0 ; n <= (ItemCount) pos ; ++n )
{
- TXNOffsetToPoint(m_txn , n , &curpt);
+ TXNOffsetToPoint( m_txn, n, &curpt ) ;
if ( curpt.v > lastHeight )
{
if ( (UInt32)TXNScroll != (UInt32)kUnresolvedCFragSymbolAddress )
{
OSErr theErr = noErr;
- SInt32 dv = desired.v - current.v ;
- SInt32 dh = desired.h - current.h ;
- TXNShowSelection( m_txn, kTXNShowEnd ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ??
- theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels , kTXNScrollUnitsInPixels , &dv , &dh );
+ SInt32 dv = desired.v - current.v;
+ SInt32 dh = desired.h - current.h;
+ TXNShowSelection( m_txn, kTXNShowStart ) ; // NB: should this be kTXNShowStart or kTXNShowEnd ??
+ theErr = TXNScroll( m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels, &dv, &dh );
// 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
{
#if wxUSE_UNICODE
#if SIZEOF_WCHAR_T == 2
- size_t len = st.Len() ;
+ size_t len = st.length() ;
TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );
#else
wxMBConvUTF16 converter ;
- ByteCount byteBufferLen = converter.WC2MB( NULL , st.wc_str() , 0 ) ;
- UniChar *unibuf = (UniChar*) malloc( byteBufferLen ) ;
+ ByteCount byteBufferLen = converter.WC2MB( NULL, st.wc_str(), 0 ) ;
+ UniChar *unibuf = (UniChar*)malloc( byteBufferLen ) ;
converter.WC2MB( (char*)unibuf, st.wc_str(), byteBufferLen ) ;
TXNSetData( m_txn, kTXNUnicodeTextData, (void*)unibuf, byteBufferLen, start, end ) ;
free( unibuf ) ;
#endif
#else
- wxCharBuffer text = st.mb_str(wxConvLocal) ;
+ wxCharBuffer text = st.mb_str( wxConvLocal ) ;
TXNSetData( m_txn, kTXNTextData, (void*)text.data(), strlen( text ), start, end ) ;
#endif
}
return line ;
}
-int wxMacMLTEControl::GetLineLength(long lineNo) const
+int wxMacMLTEControl::GetLineLength(long lineNo) const
{
int theLength = 0;
{
Point firstPoint;
Fixed lineWidth, lineHeight, currentHeight;
- long ypos ;
+ long ypos;
// get the first possible position in the control
TXNOffsetToPoint(m_txn, 0, &firstPoint);
switch ( partCode )
{
-
case kControlDownButtonPart :
delta = 10 ;
break ;
break ;
case kControlIndicatorPart :
- delta = value -
- ( isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue ) ;
+ delta = value - (isHorizontal ? mlte->m_lastHorizontalValue : mlte->m_lastVerticalValue) ;
break ;
default :
err = TXNScroll(
mlte->m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
&verticalDelta, &horizontalDelta );
+ verify_noerr( err );
if ( isHorizontal )
mlte->m_lastHorizontalValue = newValue ;
wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
wxMacWindowClipper clipper( textctrl ) ;
- TXNActivate(m_txn, m_txnFrameID, setActive);
+ TXNActivate( m_txn, m_txnFrameID, setActive );
ControlRef controlFocus = 0 ;
GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
SetKeyboardFocus( m_txnWindow , m_controlRef , kControlFocusNoPart ) ;
TXNControlTag iControlTags[1] = { kTXNVisibilityTag };
- TXNControlData iControlData[1] = { {(UInt32) false } };
+ TXNControlData iControlData[1] = { { (UInt32)false } };
verify_noerr( TXNGetTXNObjectControls( m_txn , 1, iControlTags, iControlData ) ) ;
void wxMacMLTEClassicControl::MacUpdatePosition()
{
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+ wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
if ( textctrl == NULL )
return ;
Rect bounds ;
- UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds);
+ UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
wxRect visRect = textctrl->MacGetClippedClientRect() ;
Rect visBounds = { visRect.y , visRect.x , visRect.y + visRect.height , visRect.x + visRect.width } ;
textctrl->MacWindowToRootWindow( &x , &y ) ;
OffsetRect( &visBounds , x , y ) ;
- if ( !EqualRect( &bounds , &m_txnControlBounds ) || !EqualRect( &visBounds , &m_txnVisBounds) )
+ if ( !EqualRect( &bounds, &m_txnControlBounds ) || !EqualRect( &visBounds, &m_txnVisBounds ) )
{
m_txnControlBounds = bounds ;
m_txnVisBounds = visBounds ;
- wxMacWindowClipper cl(textctrl) ;
+ wxMacWindowClipper cl( textctrl ) ;
#ifdef __WXMAC_OSX__
- bool isCompositing = textctrl->MacGetTopLevelWindow()->MacUsesCompositing() ;
if ( m_sbHorizontal || m_sbVertical )
{
int w = bounds.right - bounds.left ;
sbBounds.right = w + 1 ;
sbBounds.bottom = h + 1 ;
- if ( !isCompositing )
- OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ;
-
SetControlBounds( m_sbHorizontal , &sbBounds ) ;
SetControlViewSize( m_sbHorizontal , w ) ;
}
sbBounds.right = w + 1 ;
sbBounds.bottom = m_sbHorizontal ? h - 14 : h + 1 ;
- if ( !isCompositing )
- OffsetRect( &sbBounds , m_txnControlBounds.left , m_txnControlBounds.top ) ;
-
SetControlBounds( m_sbVertical , &sbBounds ) ;
SetControlViewSize( m_sbVertical , h ) ;
}
#endif
#else
- TXNSetFrameBounds( m_txn, m_txnControlBounds.top, m_txnControlBounds.left,
- wxMax( m_txnControlBounds.bottom , m_txnControlBounds.top ) ,
- wxMax( m_txnControlBounds.right , m_txnControlBounds.left ) , m_txnFrameID);
+ TXNSetFrameBounds(
+ m_txn, m_txnControlBounds.top, m_txnControlBounds.left,
+ wxMax( m_txnControlBounds.bottom, m_txnControlBounds.top ),
+ wxMax( m_txnControlBounds.right, m_txnControlBounds.left ), m_txnFrameID );
#endif
- // the SetFrameBounds method unter classic sometimes does not correctly scroll a selection into sight after a
+
+ // the SetFrameBounds method under Classic sometimes does not correctly scroll a selection into sight after a
// movement, therefore we have to force it
// this problem has been reported in OSX as well, so we use this here once again
void wxMacMLTEClassicControl::MacControlUserPaneDrawProc(wxInt16 thePart)
{
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+ wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
if ( textctrl == NULL )
return ;
else
{
// sometimes we get the coords also in control local coordinates, therefore test again
- if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() )
- {
- int x = 0 , y = 0 ;
- textctrl->MacClientToRootWindow( &x , &y ) ;
- where.h += x ;
- where.v += y ;
- }
+ int x = 0 , y = 0 ;
+ textctrl->MacClientToRootWindow( &x , &y ) ;
+ where.h += x ;
+ where.v += y ;
if (PtInRect( where, &m_txnControlBounds ))
result = kControlEditTextPart ;
if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
{
Point startPt = { y , x } ;
+
// for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
- if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() )
- {
- int x = 0 , y = 0 ;
- textctrl->MacClientToRootWindow( &x , &y ) ;
- startPt.h += x ;
- startPt.v += y ;
- }
+ int x = 0 , y = 0 ;
+ textctrl->MacClientToRootWindow( &x , &y ) ;
+ startPt.h += x ;
+ startPt.v += y ;
switch (MacControlUserPaneHitTestProc( startPt.h , startPt.v ))
{
case kControlEditTextPart :
{
wxMacWindowClipper clipper( textctrl ) ;
-
EventRecord rec ;
+
ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
TXNClick( m_txn, &rec );
}
void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
{
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+ wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
if ( textctrl == NULL )
return ;
wxInt16 wxMacMLTEClassicControl::MacControlUserPaneKeyDownProc (wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
{
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+ wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
if ( textctrl == NULL )
return kControlNoPart;
return kControlEntireControl;
}
-void wxMacMLTEClassicControl::MacControlUserPaneActivateProc( bool activating)
+void wxMacMLTEClassicControl::MacControlUserPaneActivateProc(bool activating)
{
MacActivatePaneText( activating );
}
wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
{
- ControlPartCode focusResult;
+ ControlPartCode focusResult = kControlFocusNoPart;
- focusResult = kControlFocusNoPart;
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+ wxTextCtrl* textctrl = (wxTextCtrl*)GetControlReference( m_controlRef );
if ( textctrl == NULL )
- return 0;
+ return focusResult;
wxMacWindowClipper clipper( textctrl ) ;
}
wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxTextCtrl *wxPeer,
- const wxString& str,
- const wxPoint& pos,
- const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )
+ const wxString& str,
+ const wxPoint& pos,
+ const wxSize& size, long style )
+ : wxMacMLTEControl( wxPeer )
{
m_font = wxPeer->GetFont() ;
m_windowStyle = style ;
Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
- short featureSet;
-
- featureSet =
+ short featureSet =
kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
| kControlWantsActivate | kControlHandlesTracking
// | kControlHasSpecialBackground
| kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
- verify_noerr(
- ::CreateUserPaneControl(
- MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
- &bounds, featureSet, &m_controlRef ) );
+ OSStatus err = ::CreateUserPaneControl(
+ MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()),
+ &bounds, featureSet, &m_controlRef );
+ verify_noerr( err );
DoCreate();
wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
if ( win )
- win->MacControlUserPaneDrawProc(part) ;
+ win->MacControlUserPaneDrawProc( part ) ;
}
static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
if ( win )
- return win->MacControlUserPaneHitTestProc(where.h , where.v) ;
+ return win->MacControlUserPaneHitTestProc( where.h , where.v ) ;
else
return kControlNoPart ;
}
wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
if ( win )
- return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ;
+ return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc ) ;
else
return kControlNoPart ;
}
wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
if ( win )
- return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ;
+ return win->MacControlUserPaneKeyDownProc( keyCode, charCode, modifiers ) ;
else
return kControlNoPart ;
}
wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
if ( win )
- win->MacControlUserPaneActivateProc(activating) ;
+ win->MacControlUserPaneActivateProc( activating ) ;
}
static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
wxMacMLTEClassicControl * win = textCtrl ? (wxMacMLTEClassicControl*)(textCtrl->GetPeer()) : NULL ;
if ( win )
- return win->MacControlUserPaneFocusProc(action) ;
+ return win->MacControlUserPaneFocusProc( action ) ;
else
return kControlNoPart ;
}
OSStatus wxMacMLTEClassicControl::DoCreate()
{
Rect bounds;
-
OSStatus err = noErr ;
// set up our globals
SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneActivateProcTag, sizeof(gTPActivateProc), &gTPActivateProc);
SetControlData(m_controlRef, kControlEntireControl, kControlUserPaneFocusProcTag, sizeof(gTPFocusProc), &gTPFocusProc);
#endif
+
// calculate the rectangles used by the control
- UMAGetControlBoundsInWindowCoords(m_controlRef, &bounds);
+ UMAGetControlBoundsInWindowCoords( m_controlRef, &bounds );
m_txnControlBounds = bounds ;
m_txnVisBounds = bounds ;
CGrafPtr origPort ;
GDHandle origDev ;
- GetGWorld( &origPort , &origDev ) ;
+ GetGWorld( &origPort, &origDev ) ;
SetPort( m_txnPort );
// create the new edit field
- TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle ) ;
+ TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( m_windowStyle );
#ifdef __WXMAC_OSX__
// the scrollbars are not correctly embedded but are inserted at the root:
Rect sb = { 0 , 0 , 0 , 0 } ;
if ( frameOptions & kTXNWantVScrollBarMask )
{
- CreateScrollBarControl( m_txnWindow , &sb , 0 , 0 , 100 , 1 , true , gTXNScrollActionProc , &m_sbVertical ) ;
- SetControlReference( m_sbVertical , (SInt32) this ) ;
+ CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbVertical );
+ SetControlReference( m_sbVertical, (SInt32)this );
SetControlAction( m_sbVertical, gTXNScrollActionProc );
- ShowControl( m_sbVertical ) ;
- EmbedControl( m_sbVertical , m_controlRef ) ;
- frameOptions &= ~kTXNWantVScrollBarMask ;
+ ShowControl( m_sbVertical );
+ EmbedControl( m_sbVertical , m_controlRef );
+ frameOptions &= ~kTXNWantVScrollBarMask;
}
if ( frameOptions & kTXNWantHScrollBarMask )
{
- CreateScrollBarControl( m_txnWindow , &sb , 0 , 0 , 100 , 1 , true , gTXNScrollActionProc , &m_sbHorizontal ) ;
- SetControlReference( m_sbHorizontal , (SInt32) this ) ;
+ CreateScrollBarControl( m_txnWindow, &sb, 0, 0, 100, 1, true, gTXNScrollActionProc, &m_sbHorizontal );
+ SetControlReference( m_sbHorizontal, (SInt32)this );
SetControlAction( m_sbHorizontal, gTXNScrollActionProc );
- ShowControl( m_sbHorizontal ) ;
- EmbedControl( m_sbHorizontal , m_controlRef ) ;
+ ShowControl( m_sbHorizontal );
+ EmbedControl( m_sbHorizontal, m_controlRef );
frameOptions &= ~(kTXNWantHScrollBarMask | kTXNDrawGrowIconMask);
}
#endif
- verify_noerr(TXNNewObject(NULL, m_txnWindow , &bounds,
- frameOptions ,
- kTXNTextEditStyleFrameType,
- kTXNTextensionFile,
- kTXNSystemDefaultEncoding,
- &m_txn, &m_txnFrameID, NULL ) );
+ err = TXNNewObject(
+ NULL, m_txnWindow, &bounds, frameOptions,
+ kTXNTextEditStyleFrameType, kTXNTextensionFile, kTXNSystemDefaultEncoding,
+ &m_txn, &m_txnFrameID, NULL );
+ verify_noerr( err );
#if 0
TXNControlTag iControlTags[] = { kTXNUseCarbonEvents };
- TXNControlData iControlData[] = { {(UInt32) &cInfo } };
+ TXNControlData iControlData[] = { { (UInt32)&cInfo } };
int toptag = WXSIZEOF( iControlTags ) ;
TXNCarbonEventInfo cInfo ;
cInfo.useCarbonEvents = false ;
cInfo.flags = 0 ;
cInfo.fDictionary = NULL ;
- verify_noerr( TXNSetTXNObjectControls( m_txn, false , toptag, iControlTags, iControlData )) ;
+ verify_noerr( TXNSetTXNObjectControls( m_txn, false, toptag, iControlTags, iControlData ) );
#endif
#ifdef __WXMAC_OSX__
- TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32) this);
+ TXNRegisterScrollInfoProc( m_txn, gTXNScrollInfoProc, (SInt32)this );
#endif
SetGWorld( origPort , origDev ) ;
+
return err;
}
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+// tiger multi-line textcontrols with no CR in the entire content
+// don't scroll automatically, so we need a hack.
+// This attempt only works 'before' the key (ie before CallNextEventHandler)
+// is processed, thus the scrolling always occurs one character too late, but
+// better than nothing ...
+
+static const EventTypeSpec eventList[] =
+{
+ { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+} ;
+
+static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+ wxMacMLTEHIViewControl* focus = (wxMacMLTEHIViewControl*) data ;
+
+ switch ( GetEventKind( event ) )
+ {
+ case kEventTextInputUnicodeForKeyEvent :
+ {
+ if ( UMAGetSystemVersion() >= 0x1040 )
+ {
+ TXNOffset from , to ;
+ TXNGetSelection( focus->GetTXNObject() , &from , &to ) ;
+ if ( from == to )
+ TXNShowSelection( focus->GetTXNObject() , kTXNShowStart );
+ }
+ result = CallNextEventHandler(handler,event);
+ break;
+ }
+ default:
+ break ;
+ }
+
+ return result ;
+}
+
+static pascal OSStatus wxMacTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+
+ switch ( GetEventClass( event ) )
+ {
+ case kEventClassTextInput :
+ result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
+ break ;
+
+ default :
+ break ;
+ }
+ return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTextControlEventHandler )
+
wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
- const wxString& str,
- const wxPoint& pos,
- const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )
+ const wxString& str,
+ const wxPoint& pos,
+ const wxSize& size, long style ) : wxMacMLTEControl( wxPeer )
{
m_font = wxPeer->GetFont() ;
m_windowStyle = style ;
wxString st = str ;
wxMacConvertNewlines10To13( &st ) ;
- HIRect hr = { { bounds.left , bounds.top} ,
- { bounds.right - bounds.left , bounds.bottom - bounds.top} } ;
+ HIRect hr = {
+ { bounds.left , bounds.top },
+ { bounds.right - bounds.left, bounds.bottom - bounds.top } } ;
m_scrollView = NULL ;
TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ;
TXNSetSelection( m_txn, 0, 0 );
TXNShowSelection( m_txn, kTXNShowStart );
+
+ InstallControlEventHandler( m_textView , GetwxMacTextControlEventHandlerUPP(),
+ GetEventTypeCount(eventList), eventList, this,
+ &m_textEventHandlerRef);
+}
+
+wxMacMLTEHIViewControl::~wxMacMLTEHIViewControl()
+{
+ ::RemoveEventHandler( m_textEventHandlerRef ) ;
}
OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart )
component[2] = col.blue / 65536.0 ;
component[3] = 1.0 ; // alpha
- CGColorRef color = CGColorCreate (rgbSpace , component );
- HITextViewSetBackgroundColor( m_textView , color ) ;
+ CGColorRef color = CGColorCreate( rgbSpace , component );
+ HITextViewSetBackgroundColor( m_textView , color );
CGColorSpaceRelease( rgbSpace );
#endif
}
projects / wxWidgets.git / blobdiff