const wxPoint& pos,
const wxSize& size, long style ) ;
~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 ) ;
delete m_privateContextMenu;
}
-bool wxTextCtrl::Create(wxWindow *parent,
+bool wxTextCtrl::Create( wxWindow *parent,
wxWindowID id,
const wxString& str,
const wxPoint& pos,
const wxSize& size,
long style,
const wxValidator& validator,
- const wxString& name)
+ const wxString& name )
{
m_macIsUserPane = false ;
m_editable = true ;
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 )
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 ;
}
// Can copy if there's a selection
long from, to;
GetSelection( &from, &to );
+
return (from != to);
}
// Can cut if there's a selection
long 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 ;
}
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)
bool wxTextCtrl::LoadFile(const wxString& file)
{
- if ( wxTextCtrlBase::LoadFile(file) )
- return true;
-
- return false;
+ return wxTextCtrlBase::LoadFile( file );
}
void wxTextCtrl::WriteText(const wxString& str)
// 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()
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)
{
// 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)
void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event))
{
long from, to;
+
GetSelection( &from, &to );
if (from != -1 && to != -1)
Remove( from, to );
void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event)
{
long from, to;
+
GetSelection( &from, &to );
event.Enable( from != -1 && to != -1 && from != to && IsEditable() ) ;
}
#if TARGET_API_MAC_OSX
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 ) ;
{
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 ) ) ;
}
TXNControlData m_data[1] ;
} ;
-wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer ) : wxMacTextControl( peer )
+wxMacMLTEControl::wxMacMLTEControl( wxTextCtrl *peer )
+ : wxMacTextControl( peer )
{
SetNeedsFocusRect( true ) ;
}
{
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
: 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[] =
{
{ 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;
if ( y == ypos && x == xpos )
return n ;
- TXNOffsetToPoint( m_txn , n , &curpt );
+ TXNOffsetToPoint( m_txn, n, &curpt ) ;
if ( curpt.v > lastHeight )
{
for ( n = 0 ; n <= (ItemCount) pos ; ++n )
{
- TXNOffsetToPoint(m_txn , n , &curpt);
+ TXNOffsetToPoint( m_txn, n, &curpt ) ;
if ( curpt.v > lastHeight )
{
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 ??
+ 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
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 ;
err = TXNScroll(
mlte->m_txn, kTXNScrollUnitsInPixels, kTXNScrollUnitsInPixels,
&verticalDelta, &horizontalDelta );
+ verify_noerr( err );
if ( isHorizontal )
mlte->m_lastHorizontalValue = newValue ;
}
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 ;
// | 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
#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 };
#endif
SetGWorld( origPort , origDev ) ;
+
return err;
}
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
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 ) ;
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