#else
#include <stat.h>
#endif
-#include <fstream.h>
+
+#if wxUSE_STD_IOSTREAM
+ #if wxUSE_IOSTREAMH
+ #include <fstream.h>
+ #else
+ #include <fstream>
+ #endif
+#endif
#include "wx/app.h"
#include "wx/dc.h"
case kmUPTextPart:
{ SetPort((**tpvars).fDrawingEnvironment);
wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
+#if !TARGET_CARBON
TXNClick( varsp->fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent());
+#else
+ EventRecord rec ;
+ ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
+ TXNClick( varsp->fTXNRec, &rec );
+#endif
}
break;
RectRgn((theRgn = NewRgn()), &varsp->fRTextArea);
TXNAdjustCursor(varsp->fTXNRec, theRgn);
DisposeRgn(theRgn);
- } else SetThemeCursor(kThemeArrowCursor);
+ }
+ else
+ {
+ // SetThemeCursor(kThemeArrowCursor);
+ }
} else {
/* if it's in our bounds, set the cursor */
GetControlBounds(theControl, &bounds);
if (PtInRect(mousep, &bounds))
- SetThemeCursor(kThemeArrowCursor);
+ {
+ // SetThemeCursor(kThemeArrowCursor);
+ }
}
HSetState((Handle) tpvars, state);
TXNFrameOptions frameOptions =
kTXNDontDrawCaretWhenInactiveMask ;
if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
- frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
-
- if ( wxStyle & wxTE_MULTILINE )
- {
- if ( ! ( wxStyle & wxTE_DONTWRAP ) )
- frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
- else
- {
- frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
- frameOptions |= kTXNWantHScrollBarMask ;
- }
-
- if ( !(wxStyle & wxTE_NO_VSCROLL ) )
- frameOptions |= kTXNWantVScrollBarMask ;
- }
- else
- frameOptions |= kTXNSingleLineOnlyMask ;
-
- if ( wxStyle & wxTE_READONLY )
- frameOptions |= kTXNReadOnlyMask ;
+ frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
+
+ if ( wxStyle & wxTE_MULTILINE )
+ {
+ if ( ! ( wxStyle & wxTE_DONTWRAP ) )
+ frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+ else
+ {
+ frameOptions |= kTXNAlwaysWrapAtViewEdgeMask ;
+ frameOptions |= kTXNWantHScrollBarMask ;
+ }
+
+ if ( !(wxStyle & wxTE_NO_VSCROLL ) )
+ frameOptions |= kTXNWantVScrollBarMask ;
+ }
+ else
+ frameOptions |= kTXNSingleLineOnlyMask ;
+
+ if ( wxStyle & wxTE_READONLY )
+ frameOptions |= kTXNReadOnlyMask ;
TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,
- frameOptions ,
+ frameOptions ,
kTXNTextEditStyleFrameType,
kTXNTextensionFile,
kTXNSystemDefaultEncoding,
/* create the control */
m_macControl = NewControl(MAC_WXHWND(parent->MacGetRootWindow()), &bounds, "\p", true, featurSet, 0, featurSet, kControlUserPaneProc, 0);
/* set up the mUP specific features and data */
- mUPOpenControl((ControlHandle) m_macControl, m_windowStyle );
- if ( parent )
- {
- parent->MacGetTopLevelWindow()->MacInstallEventHandler() ;
- }
+ mUPOpenControl((ControlHandle) m_macControl, m_windowStyle );
}
MacPostControlCreate() ;
m_macTXN = (**tpvars).fTXNRec ;
m_macTXNvars = tpvars ;
m_macUsesTXN = true ;
- TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
+ TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
}
wxString wxTextCtrl::GetValue() const
{
- Size actualsize;
-
+ Size actualSize = 0;
+ wxString result ;
+ OSStatus err ;
if ( !m_macUsesTXN )
{
- ::GetControlData( (ControlHandle) m_macControl, 0,
- ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag,
- 32767 , wxBuffer , &actualsize ) ;
+ err = ::GetControlDataSize((ControlHandle) m_macControl, 0,
+ ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag, &actualSize ) ;
+
+ if ( err )
+ return wxEmptyString ;
+
+ if ( actualSize > 0 )
+ {
+ wxChar *ptr = result.GetWriteBuf(actualSize) ;
+
+ ::GetControlData( (ControlHandle) m_macControl, 0,
+ ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag,
+ actualSize , ptr , &actualSize ) ;
+ ptr[actualSize] = 0 ;
+ result.UngetWriteBuf(actualSize) ;
+ }
+
}
else
{
Handle theText ;
- OSStatus err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
+ err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
// all done
if ( err )
{
- actualsize = 0 ;
+ actualSize = 0 ;
}
else
{
- actualsize = GetHandleSize( theText ) ;
- if (actualsize != 0)
- strncpy( wxBuffer , *theText , actualsize ) ;
- DisposeHandle( theText ) ;
+ actualSize = GetHandleSize( theText ) ;
+ if ( actualSize > 0 )
+ {
+ wxChar *ptr = result.GetWriteBuf(actualSize) ;
+ strncpy( ptr , *theText , actualSize ) ;
+ ptr[actualSize] = 0 ;
+ result.UngetWriteBuf( actualSize ) ;
+ }
+ DisposeHandle( theText ) ;
}
}
- wxBuffer[actualsize] = 0 ;
-
- wxString value;
-
- if( wxApp::s_macDefaultEncodingIsPC )
- value = wxMacMakePCStringFromMac( wxBuffer ) ;
- else
- value = wxBuffer;
-
- value.Replace( "\r", "\n" );
-
- return value;
+ return wxMacMakeStringFromMacString( result ) ;
}
void wxTextCtrl::GetSelection(long* from, long* to) const
wxString value;
if( wxApp::s_macDefaultEncodingIsPC )
+ {
value = wxMacMakeMacStringFromPC( st ) ;
+ // value.Replace( "\n", "\r" ); TODO this should be handled by the conversion
+ }
else
value = st;
- value.Replace( "\n", "\r" );
if ( !m_macUsesTXN )
{
else
{
bool formerEditable = IsEditable() ;
- SetEditable(true) ;
- TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(),
- kTXNStartOffset, kTXNEndOffset);
- TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
+ if ( !formerEditable )
+ SetEditable(true) ;
+ TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(),
+ kTXNStartOffset, kTXNEndOffset);
+ TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
- SetEditable(formerEditable) ;
+ if ( !formerEditable )
+ SetEditable(formerEditable) ;
}
MacRedrawControl() ;
}
if ( m_macUsesTXN )
{
bool formerEditable = IsEditable() ;
- SetEditable(true) ;
- TXNTypeAttributes typeAttr[4] ;
- Str255 fontName = "\pMonaco" ;
- SInt16 fontSize = 12 ;
- Style fontStyle = normal ;
- RGBColor color ;
- int attrCounter = 0 ;
- if ( style.HasFont() )
- {
- const wxFont &font = style.GetFont() ;
- CopyCStringToPascal( font.GetFaceName().c_str() , fontName ) ;
- fontSize = font.GetPointSize() ;
- if ( font.GetUnderlined() )
- fontStyle |= underline ;
- if ( font.GetWeight() == wxBOLD )
- fontStyle |= bold ;
- if ( font.GetStyle() == wxITALIC )
- fontStyle |= italic ;
-
- typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
- typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
- typeAttr[attrCounter].data.dataPtr = (void*) fontName ;
- typeAttr[attrCounter+1].tag = kTXNQDFontSizeAttribute ;
- typeAttr[attrCounter+1].size = kTXNFontSizeAttributeSize ;
- typeAttr[attrCounter+1].data.dataValue = (fontSize << 16) ;
- typeAttr[attrCounter+2].tag = kTXNQDFontStyleAttribute ;
- typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ;
- typeAttr[attrCounter+2].data.dataValue = fontStyle ;
- attrCounter += 3 ;
-
- }
- if ( style.HasTextColour() )
- {
- typeAttr[attrCounter].tag = kTXNQDFontColorAttribute ;
- typeAttr[attrCounter].size = kTXNQDFontColorAttributeSize ;
- typeAttr[attrCounter].data.dataPtr = (void*) &color ;
- color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
- attrCounter += 1 ;
- }
+ if ( !formerEditable )
+ SetEditable(true) ;
+ TXNTypeAttributes typeAttr[4] ;
+ Str255 fontName = "\pMonaco" ;
+ SInt16 fontSize = 12 ;
+ Style fontStyle = normal ;
+ RGBColor color ;
+ int attrCounter = 0 ;
+ if ( style.HasFont() )
+ {
+ const wxFont &font = style.GetFont() ;
+ CopyCStringToPascal( font.GetFaceName().c_str() , fontName ) ;
+ fontSize = font.GetPointSize() ;
+ if ( font.GetUnderlined() )
+ fontStyle |= underline ;
+ if ( font.GetWeight() == wxBOLD )
+ fontStyle |= bold ;
+ if ( font.GetStyle() == wxITALIC )
+ fontStyle |= italic ;
+
+ typeAttr[attrCounter].tag = kTXNQDFontNameAttribute ;
+ typeAttr[attrCounter].size = kTXNQDFontNameAttributeSize ;
+ typeAttr[attrCounter].data.dataPtr = (void*) fontName ;
+ typeAttr[attrCounter+1].tag = kTXNQDFontSizeAttribute ;
+ typeAttr[attrCounter+1].size = kTXNFontSizeAttributeSize ;
+ typeAttr[attrCounter+1].data.dataValue = (fontSize << 16) ;
+ typeAttr[attrCounter+2].tag = kTXNQDFontStyleAttribute ;
+ typeAttr[attrCounter+2].size = kTXNQDFontStyleAttributeSize ;
+ typeAttr[attrCounter+2].data.dataValue = fontStyle ;
+ attrCounter += 3 ;
+
+ }
+ if ( style.HasTextColour() )
+ {
+ typeAttr[attrCounter].tag = kTXNQDFontColorAttribute ;
+ typeAttr[attrCounter].size = kTXNQDFontColorAttributeSize ;
+ typeAttr[attrCounter].data.dataPtr = (void*) &color ;
+ color = MAC_WXCOLORREF(style.GetTextColour().GetPixel()) ;
+ attrCounter += 1 ;
+ }
if ( attrCounter > 0 )
{
OSStatus status = TXNSetTypeAttributes ((TXNObject)m_macTXN, attrCounter , typeAttr,
start,end);
+ wxASSERT_MSG( status == noErr , "Couldn't set text attributes" ) ;
}
- SetEditable(formerEditable) ;
+ if ( !formerEditable )
+ SetEditable(formerEditable) ;
}
return TRUE ;
}
if (!IsEditable())
return FALSE;
- long offset ;
#if TARGET_CARBON
OSStatus err = noErr;
ScrapRef scrapRef;
return FALSE;
#else
+ long offset ;
if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
{
return TRUE ;
if ( !m_macUsesTXN )
{
if ( editable )
- UMAActivateControl( (ControlHandle) m_macControl ) ;
+ UMAActivateControl( (ControlHandle) m_macControl ) ;
else
- UMADeactivateControl((ControlHandle) m_macControl ) ;
+ UMADeactivateControl((ControlHandle) m_macControl ) ;
}
else
{
TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
- TXNControlData data[] = { editable ? kTXNReadWrite : kTXNReadOnly } ;
+ TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ;
}
}
else
{
bool formerEditable = IsEditable() ;
- SetEditable(true) ;
- TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
- TXNClear( ((TXNObject) m_macTXN) ) ;
- TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(),
- kTXNUseCurrentSelection, kTXNUseCurrentSelection);
- SetEditable( formerEditable ) ;
+ if ( !formerEditable )
+ SetEditable(true) ;
+ TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
+ TXNClear( ((TXNObject) m_macTXN) ) ;
+ TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(),
+ kTXNUseCurrentSelection, kTXNUseCurrentSelection);
+ if ( !formerEditable )
+ SetEditable( formerEditable ) ;
}
Refresh() ;
}
else
{
bool formerEditable = IsEditable() ;
- SetEditable(true) ;
+ if ( !formerEditable )
+ SetEditable(true) ;
TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
TXNClear( ((TXNObject) m_macTXN) ) ;
- SetEditable( formerEditable ) ;
+ if ( !formerEditable )
+ SetEditable( formerEditable ) ;
}
Refresh() ;
}
{
wxString value ;
if( wxApp::s_macDefaultEncodingIsPC )
+ {
value = wxMacMakeMacStringFromPC( text ) ;
+ // value.Replace( "\n", "\r" ); // TODO this should be handled by the conversion
+ }
else
value = text ;
+
if ( !m_macUsesTXN )
{
TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;
else
{
bool formerEditable = IsEditable() ;
- SetEditable(true) ;
- long start , end , dummy ;
- GetSelection( &start , &dummy ) ;
+ if ( !formerEditable )
+ SetEditable(true) ;
+ long start , end , dummy ;
+ GetSelection( &start , &dummy ) ;
TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*) (const char*)value, value.Length(),
kTXNUseCurrentSelection, kTXNUseCurrentSelection);
- GetSelection( &dummy , &end ) ;
+ GetSelection( &dummy , &end ) ;
SetStyle( start , end , GetDefaultStyle() ) ;
- SetEditable( formerEditable ) ;
+ if ( !formerEditable )
+ SetEditable( formerEditable ) ;
}
MacRedrawControl() ;
}
wxString content = GetValue() ;
int count = 1;
- for (int i = 0; i < content.Length() ; i++)
+ for (size_t i = 0; i < content.Length() ; i++)
{
if (content[i] == '\r') count++;
}
// Find line first
int count = 0;
- for (int 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 (int j = i; j < content.Length(); j++)
+ for (size_t j = i; j < content.Length(); j++)
{
count++;
if (content[j] == '\r') return count;
// Find line first
int count = 0;
- for (int 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 (int j = i; j < content.Length(); j++)
+ for (size_t j = i; j < content.Length(); j++)
{
if (content[j] == '\r')
return tmp;
bool retval = wxControl::Show( show ) ;
- if ( former != m_macControlIsShown )
+ if ( former != m_macControlIsShown && show )
{
if ( m_macControlIsShown )
TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,
// standard handlers for standard edit menu events
// ----------------------------------------------------------------------------
-void wxTextCtrl::OnCut(wxCommandEvent& event)
+void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
{
Cut();
}
-void wxTextCtrl::OnCopy(wxCommandEvent& event)
+void wxTextCtrl::OnCopy(wxCommandEvent& WXUNUSED(event))
{
Copy();
}
-void wxTextCtrl::OnPaste(wxCommandEvent& event)
+void wxTextCtrl::OnPaste(wxCommandEvent& WXUNUSED(event))
{
Paste();
}
-void wxTextCtrl::OnUndo(wxCommandEvent& event)
+void wxTextCtrl::OnUndo(wxCommandEvent& WXUNUSED(event))
{
Undo();
}
-void wxTextCtrl::OnRedo(wxCommandEvent& event)
+void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
{
Redo();
}
event.Enable( CanRedo() );
}
-
+bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
+{
+ if ( m_macUsesTXN )
+ return true ;
+ else
+ return wxWindow::MacSetupCursor( pt ) ;
+}
#endif
// wxUSE_TEXTCTRL
projects / wxWidgets.git / blobdiff