#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 <stat.h>
#endif
-#include "wx/msgdlg.h"
-
#if wxUSE_STD_IOSTREAM
#if wxUSE_IOSTREAMH
#include <fstream.h>
#endif
#endif
-#include "wx/toplevel.h"
-#include "wx/settings.h"
#include "wx/filefn.h"
#include "wx/sysopt.h"
m_param1 = p1 ;
}
- ~wxMacObjectFunctor1() {}
+ virtual ~wxMacObjectFunctor1() {}
virtual void* operator()()
{
{
public :
wxMacTextControl( wxTextCtrl *peer ) ;
- ~wxMacTextControl() ;
+ virtual ~wxMacTextControl() ;
virtual wxString GetStringValue() const = 0 ;
virtual void SetStringValue( const wxString &val ) = 0 ;
virtual bool SetupCursor( const wxPoint& pt )
{ return false ; }
-
+
virtual void Clear() ;
virtual bool CanUndo() const;
virtual void Undo() ;
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style ) ;
- ~wxMacMLTEHIViewControl() ;
-
+ virtual ~wxMacMLTEHIViewControl() ;
+
virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
virtual bool HasFocus() const ;
virtual void SetBackground( const wxBrush &brush) ;
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style ) ;
- ~wxMacUnicodeTextControl();
+ virtual ~wxMacUnicodeTextControl();
virtual void VisibilityChanged(bool shown);
virtual wxString GetStringValue() const ;
const wxString& str,
const wxPoint& pos,
const wxSize& size, long style ) ;
- ~wxMacMLTEClassicControl() ;
+ virtual ~wxMacMLTEClassicControl() ;
virtual void VisibilityChanged(bool shown) ;
virtual void SuperChangedPosition() ;
};
-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)
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 ;
}
GetPeer()->SetSelection( from , to ) ;
}
-bool wxTextCtrl::LoadFile(const wxString& file)
-{
- return wxTextCtrlBase::LoadFile( file );
-}
-
void wxTextCtrl::WriteText(const wxString& str)
{
// TODO: this MPRemoting will be moved into a remoting peer proxy for any command
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 ( ( key >= 0x20 && key < WXK_START ) ||
+ ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||
key == WXK_RETURN ||
key == WXK_DELETE ||
key == WXK_BACK)
OSStatus result = eventNotHandledErr ;
wxMacUnicodeTextControl* focus = (wxMacUnicodeTextControl*) data ;
wxMacCarbonEvent cEvent( event ) ;
-
+
switch ( GetEventKind( event ) )
{
case kEventControlSetFocusPart :
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 ;
}
verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ) ;
else
sel = m_selection ;
-
+
if ( from )
*from = sel.selStart ;
if ( to )
if ( value )
{
wxMacCFStringHolder cf(value) ;
- textLength = cf.AsString().Length() ;
+ textLength = cf.AsString().length() ;
}
if ((from == -1) && (to == -1))
{
from = 0 ;
- to = textLength ;
+ to = textLength ;
}
else
{
CFStringRef value = cf ;
SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
}
+ else
#endif
{
wxString val = GetStringValue() ;
| kTXNSupportSpellCheckCommandUpdating
| kTXNSupportFontCommandProcessing
| kTXNSupportFontCommandUpdating;
-
+
TXNSetCommandEventSupport( m_txn , options ) ;
}
}
if ( style.HasFont() )
{
const wxFont &font = style.GetFont() ;
-
+
#if 0 // old version
Str255 fontName = "\pMonaco" ;
SInt16 fontSize = 12 ;
{
#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 ;
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 ) ;
}
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 ))
{
#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.
+// 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 ...
{
{ kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
} ;
-
+
static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
wxMacMLTEHIViewControl* focus = (wxMacMLTEHIViewControl*) data ;
-
+
switch ( GetEventKind( event ) )
{
case kEventTextInputUnicodeForKeyEvent :
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 ;
}
projects / wxWidgets.git / blobdiff