#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"
#include "TextEncodingConverter.h"
#include "wx/mac/uma.h"
-extern wxApp *wxTheApp ;
-// CS:We will replace the TextEdit by using the MultiLanguageTextEngine based on the following code written by apple
+#define TE_UNLIMITED_LENGTH 0xFFFFFFFFUL
-/*
- File: mUPControl.c
-
- Description:
- mUPControl implementation.
+extern wxApp *wxTheApp ;
+extern wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
- Copyright:
- © Copyright 2000 Apple Computer, Inc. All rights reserved.
-
- Disclaimer:
- IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
- ("Apple") in consideration of your agreement to the following terms, and your
- use, installation, modification or redistribution of this Apple software
- constitutes acceptance of these terms. If you do not agree with these terms,
- please do not use, install, modify or redistribute this Apple software.
-
- In consideration of your agreement to abide by the following terms, and subject
- to these terms, Apple grants you a personal, non-exclusive license, under AppleÕs
- copyrights in this original Apple software (the "Apple Software"), to use,
- reproduce, modify and redistribute the Apple Software, with or without
- modifications, in source and/or binary forms; provided that if you redistribute
- the Apple Software in its entirety and without modifications, you must retain
- this notice and the following text and disclaimers in all such redistributions of
- the Apple Software. Neither the name, trademarks, service marks or logos of
- Apple Computer, Inc. may be used to endorse or promote products derived from the
- Apple Software without specific prior written permission from Apple. Except as
- expressly stated in this notice, no other rights or licenses, express or implied,
- are granted by Apple herein, including but not limited to any patent rights that
- may be infringed by your derivative works or by other works in which the Apple
- Software may be incorporated.
-
- The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
- WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
- COMBINATION WITH YOUR PRODUCTS.
-
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
- OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
- (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- Change History (most recent first):
- Fri, Jan 28, 2000 -- created
-*/
+// CS:TODO we still have a problem getting properly at the text events of a control because under Carbon
+// the MLTE engine registers itself for the key events thus the normal flow never occurs, the only measure for the
+// moment is to avoid setting the true focus on the control, the proper solution at the end would be to have
+// an alternate path for carbon key events that routes automatically into the same wx flow of events
#include "MacTextEditor.h"
should refer to a user pane control that you have either created
yourself or extracted from a dialog's control heirarchy using
the GetDialogItemAsControl routine. */
-OSStatus mUPOpenControl(ControlHandle theControl, bool multiline);
+OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle);
/* Utility Routines */
/* OS records referenced */
TXNObject fTXNRec; /* the txn record */
TXNFrameID fTXNFrame; /* the txn frame ID */
- bool fMultiline ;
ControlHandle fUserPaneRec; /* handle to the user pane control */
WindowPtr fOwner; /* window containing control */
GrafPtr fDrawingEnvironment; /* grafport where control is drawn */
/* our focus advance override routine */
EventHandlerUPP handlerUPP;
EventHandlerRef handlerRef;
+ bool fMultiline ;
} STPTextPaneVars;
ControlUserPaneActivateUPP gTPActivateProc = NULL;
ControlUserPaneFocusUPP gTPFocusProc = NULL;
- /* events handled by our focus advance override routine */
-#if TARGET_CARBON
-//static const EventTypeSpec gMLTEEvents[] = { { kEventClassTextInput, kEventUnicodeForKeyEvent } };
-//#define kMLTEEventCount (sizeof( gMLTEEvents ) / sizeof( EventTypeSpec ))
-#endif
-
-
/* TPActivatePaneText activates or deactivates the text edit record
according to the value of setActive. The primary purpose of this
routine is to ensure each call is only made once. */
varsp->fTEActive = setActive;
TXNActivate(varsp->fTXNRec, varsp->fTXNFrame, varsp->fTEActive);
-
+
if (varsp->fInFocus)
TXNFocus( varsp->fTXNRec, varsp->fTEActive);
}
char state;
Rect bounds;
/* set up our globals */
+
tpvars = (STPTextPaneVars **) GetControlReference(theControl);
if (tpvars != NULL) {
state = HGetState((Handle) tpvars);
/* save the drawing state */
SetPort((**tpvars).fDrawingEnvironment);
- /* verify our boundary */
+ /* verify our boundary */
GetControlBounds(theControl, &bounds);
- if ( ! EqualRect(&bounds, &varsp->fRFocusOutline) ) {
- // scrollbar is on the border, we add one
- Rect oldbounds = varsp->fRFocusOutline ;
- InsetRect( &oldbounds , -1 , -1 ) ;
-
-// InvalWindowRect( GetControlOwner( theControl ) , &oldbounds ) ;
- SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
- SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
- SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,
- bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
+
+ wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
+ if ( ! EqualRect(&bounds, &varsp->fRFocusOutline) ) {
+ // scrollbar is on the border, we add one
+ Rect oldbounds = varsp->fRFocusOutline ;
+ InsetRect( &oldbounds , -1 , -1 ) ;
+
+ InvalWindowRect( GetControlOwner( theControl ) , &oldbounds ) ;
+ SetRect(&varsp->fRFocusOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
+ SetRect(&varsp->fRTextOutline, bounds.left, bounds.top, bounds.right, bounds.bottom);
+ SetRect(&varsp->fRTextArea, bounds.left + 2 , bounds.top + (varsp->fMultiline ? 0 : 2) ,
+ bounds.right - (varsp->fMultiline ? 0 : 2), bounds.bottom - (varsp->fMultiline ? 0 : 2));
RectRgn(varsp->fTextBackgroundRgn, &varsp->fRTextOutline);
- TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
- varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
+ TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
+ varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
}
/* update the text region */
- RGBColor white = { 65535 , 65535 , 65535 } ;
- RGBBackColor( &white ) ;
+ RGBColor white = { 65535 , 65535 , 65535 } ;
+ RGBBackColor( &white ) ;
EraseRgn(varsp->fTextBackgroundRgn);
TXNDraw(varsp->fTXNRec, NULL);
/* restore the drawing environment */
if ((**tpvars).fIsActive && varsp->fInFocus) DrawThemeFocusRect(&varsp->fRFocusOutline, true);
/* release our globals */
HSetState((Handle) tpvars, state);
+
}
}
/* handle clicks in the text part */
case kmUPTextPart:
{ SetPort((**tpvars).fDrawingEnvironment);
+ wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
TXNClick( varsp->fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent());
}
break;
varsp = *tpvars;
/* get the current mouse coordinates (in our window) */
SetPortWindowPort(GetControlOwner(theControl));
+ wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
GetMouse(&mousep);
/* there's a 'focus thing' and an 'unfocused thing' */
if (varsp->fInFocus) {
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);
if ((**tpvars).fInFocus) {
/* turn autoscrolling on and send the key event to text edit */
SetPort((**tpvars).fDrawingEnvironment);
- TXNKeyDown( (**tpvars).fTXNRec, (const EventRecord*) wxTheApp->MacGetCurrentEvent());
+ wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
+ EventRecord ev ;
+ memset( &ev , 0 , sizeof( ev ) ) ;
+ ev.what = keyDown ;
+ ev.modifiers = modifiers ;
+ ev.message = (( keyCode << 8 ) & keyCodeMask ) + ( charCode & charCodeMask ) ;
+ TXNKeyDown( (**tpvars).fTXNRec, &ev);
}
}
return kControlEntireControl;
varsp = *tpvars;
/* de/activate the text edit record */
SetPort((**tpvars).fDrawingEnvironment);
+ wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
GetControlBounds(theControl, &bounds);
varsp->fIsActive = activating;
TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);
define your own value for handling click-to-focus type events. */
/* save the drawing state */
SetPort((**tpvars).fDrawingEnvironment);
+ wxMacWindowClipper clipper( wxFindControlFromMacControl(theControl ) ) ;
/* calculate the next highlight state */
switch (action) {
default:
return focusResult;
}
-//This our carbon event handler for unicode key downs
-#if TARGET_CARBON
-static pascal OSStatus FocusAdvanceOverride(EventHandlerCallRef myHandler, EventRef event, void* userData) {
- WindowRef window;
- STPTextPaneVars **tpvars;
- OSStatus err;
- unsigned short mUnicodeText;
- ByteCount charCounts=0;
- /* get our window pointer */
- tpvars = (STPTextPaneVars **) userData;
- window = (**tpvars).fOwner;
- //find out how many bytes are needed
- err = GetEventParameter(event, kEventParamTextInputSendText,
- typeUnicodeText, NULL, 0, &charCounts, NULL);
- if (err != noErr) goto bail;
- /* we're only looking at single characters */
- if (charCounts != 2) { err = eventNotHandledErr; goto bail; }
- /* get the character */
- err = GetEventParameter(event, kEventParamTextInputSendText,
- typeUnicodeText, NULL, sizeof(mUnicodeText),
- &charCounts, (char*) &mUnicodeText);
- if (err != noErr) goto bail;
- /* if it's not the tab key, forget it... */
- if ((mUnicodeText != '\t')) { err = eventNotHandledErr; goto bail; }
- /* advance the keyboard focus */
- AdvanceKeyboardFocus(window);
- /* noErr lets the CEM know we handled the event */
- return noErr;
-bail:
- return eventNotHandledErr;
-}
-#endif
-
/* mUPOpenControl initializes a user pane control so it will be drawn
- and will behave as a scrolling text edit field inside of a window.
- This routine performs all of the initialization steps necessary,
- except it does not create the user pane control itself. theControl
- should refer to a user pane control that you have either created
- yourself or extracted from a dialog's control heirarchy using
- the GetDialogItemAsControl routine. */
-OSStatus mUPOpenControl(ControlHandle theControl, bool multiline)
+ and will behave as a scrolling text edit field inside of a window.
+ This routine performs all of the initialization steps necessary,
+ except it does not create the user pane control itself. theControl
+ should refer to a user pane control that you have either created
+ yourself or extracted from a dialog's control heirarchy using
+ the GetDialogItemAsControl routine. */
+OSStatus mUPOpenControl(ControlHandle theControl, long wxStyle )
{
- Rect bounds;
- WindowRef theWindow;
- STPTextPaneVars **tpvars, *varsp;
- OSStatus err;
- RGBColor rgbWhite = {0xFFFF, 0xFFFF, 0xFFFF};
- TXNBackground tback;
-
- /* set up our globals */
- if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(TPPaneDrawProc);
- if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(TPPaneHitTestProc);
- if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(TPPaneTrackingProc);
- if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(TPPaneIdleProc);
- if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(TPPaneKeyDownProc);
- if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(TPPaneActivateProc);
- if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(TPPaneFocusProc);
-
- /* allocate our private storage */
- tpvars = (STPTextPaneVars **) NewHandleClear(sizeof(STPTextPaneVars));
- SetControlReference(theControl, (long) tpvars);
- HLock((Handle) tpvars);
- varsp = *tpvars;
- /* set the initial settings for our private data */
- varsp->fMultiline = multiline ;
- varsp->fInFocus = false;
- varsp->fIsActive = true;
- varsp->fTEActive = true; // in order to get a deactivate
- varsp->fUserPaneRec = theControl;
- theWindow = varsp->fOwner = GetControlOwner(theControl);
+ Rect bounds;
+ WindowRef theWindow;
+ STPTextPaneVars **tpvars, *varsp;
+ OSStatus err = noErr ;
+ RGBColor rgbWhite = {0xFFFF, 0xFFFF, 0xFFFF};
+ TXNBackground tback;
+
+ /* set up our globals */
+ if (gTPDrawProc == NULL) gTPDrawProc = NewControlUserPaneDrawUPP(TPPaneDrawProc);
+ if (gTPHitProc == NULL) gTPHitProc = NewControlUserPaneHitTestUPP(TPPaneHitTestProc);
+ if (gTPTrackProc == NULL) gTPTrackProc = NewControlUserPaneTrackingUPP(TPPaneTrackingProc);
+ if (gTPIdleProc == NULL) gTPIdleProc = NewControlUserPaneIdleUPP(TPPaneIdleProc);
+ if (gTPKeyProc == NULL) gTPKeyProc = NewControlUserPaneKeyDownUPP(TPPaneKeyDownProc);
+ if (gTPActivateProc == NULL) gTPActivateProc = NewControlUserPaneActivateUPP(TPPaneActivateProc);
+ if (gTPFocusProc == NULL) gTPFocusProc = NewControlUserPaneFocusUPP(TPPaneFocusProc);
+
+ /* allocate our private storage */
+ tpvars = (STPTextPaneVars **) NewHandleClear(sizeof(STPTextPaneVars));
+ SetControlReference(theControl, (long) tpvars);
+ HLock((Handle) tpvars);
+ varsp = *tpvars;
+ /* set the initial settings for our private data */
+ varsp->fMultiline = wxStyle & wxTE_MULTILINE ;
+ varsp->fInFocus = false;
+ varsp->fIsActive = true;
+ varsp->fTEActive = true; // in order to get a deactivate
+ varsp->fUserPaneRec = theControl;
+ theWindow = varsp->fOwner = GetControlOwner(theControl);
varsp->fDrawingEnvironment = (GrafPtr) GetWindowPort(theWindow);
SetPort(varsp->fDrawingEnvironment);
/* create the new edit field */
+
+ 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 ;
+
TXNNewObject(NULL, varsp->fOwner, &varsp->fRTextArea,
- ( multiline ? kTXNWantVScrollBarMask : 0 )
- | kTXNAlwaysWrapAtViewEdgeMask,
+ frameOptions ,
kTXNTextEditStyleFrameType,
kTXNTextensionFile,
kTXNSystemDefaultEncoding,
&varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) tpvars);
- /* set the field's font and style */
- TXNTypeAttributes typeAttr[2];
- typeAttr[0].tag = kTXNQDFontSizeAttribute;
- typeAttr[0].size = kTXNFontSizeAttributeSize;
- typeAttr[0].data.dataValue = 10 << 16;
-
- typeAttr[1].tag = kTXNQDFontStyleAttribute;
- typeAttr[1].size = kTXNQDFontStyleAttributeSize;
- typeAttr[1].data.dataValue = normal ;
-
- /* this does not seem to get the font id through
- typeAttr[2].tag = kTXNQDFontFamilyIDAttribute ; // NameAttribute;
- typeAttr[2].size = kTXNQDFontFamilyIDAttributeSize ; // kTXNQDFontNameAttributeSize;
- typeAttr[2].data.dataValue = kFontIDTimes ; // (void*) "\pGeneva" ;
- */
-
- OSStatus status = TXNSetTypeAttributes (varsp->fTXNRec, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr,
- kTXNStartOffset,
- kTXNEndOffset);
+ Str255 fontName ;
+ SInt16 fontSize ;
+ Style fontStyle ;
+
+ GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+
+ TXNTypeAttributes typeAttr[] =
+ {
+ { kTXNQDFontNameAttribute , kTXNQDFontNameAttributeSize , { (void*) fontName } } ,
+ { kTXNQDFontSizeAttribute , kTXNFontSizeAttributeSize , { (void*) (fontSize << 16) } } ,
+ { kTXNQDFontStyleAttribute , kTXNQDFontStyleAttributeSize , { (void*) normal } } ,
+ } ;
+
+ err = TXNSetTypeAttributes (varsp->fTXNRec, sizeof( typeAttr ) / sizeof(TXNTypeAttributes) , typeAttr,
+ kTXNStartOffset,
+ kTXNEndOffset);
/* set the field's background */
tback.bgType = kTXNBackgroundTypeRGB;
tback.bg.color = rgbWhite;
TXNSetBackground( varsp->fTXNRec, &tback);
-
- /* install our focus advance override routine */
-#if TARGET_CARBON
-// varsp->handlerUPP = NewEventHandlerUPP(FocusAdvanceOverride);
-// err = InstallWindowEventHandler( varsp->fOwner, varsp->handlerUPP,
-// kMLTEEventCount, gMLTEEvents, tpvars, &varsp->handlerRef );
-#endif
-
+
/* unlock our storage */
HUnlock((Handle) tpvars);
/* perform final activations and setup for our text field. Here,
we assume that the window is going to be the 'active' window. */
TPActivatePaneText(tpvars, varsp->fIsActive && varsp->fInFocus);
/* all done */
- return noErr;
+ return err;
}
// Text item
wxTextCtrl::wxTextCtrl()
{
- ((TEHandle) m_macTE) = NULL ;
- ((TXNObject) m_macTXN) = NULL ;
+ m_macTE = NULL ;
+ m_macTXN = NULL ;
+ m_macTXNvars = NULL ;
m_macUsesTXN = false ;
m_editable = true ;
+ m_maxLength = TE_UNLIMITED_LENGTH ;
}
wxTextCtrl::~wxTextCtrl()
{
if ( m_macUsesTXN )
{
+ SetControlReference((ControlHandle)m_macControl, 0) ;
TXNDeleteObject((TXNObject)m_macTXN);
- #if TARGET_CARBON
- /* remove our focus advance override */
- // RemoveEventHandler((**tpvars).handlerRef);
- // DisposeEventHandlerUPP((**tpvars).handlerUPP);
- #endif
/* delete our private storage */
DisposeHandle((Handle) m_macTXNvars);
/* zero the control reference */
- SetControlReference((ControlHandle)m_macControl, 0) ;
}
}
const wxValidator& validator,
const wxString& name)
{
- ((TEHandle) m_macTE) = NULL ;
- ((TXNObject) m_macTXN) = NULL ;
+ m_macTE = NULL ;
+ m_macTXN = NULL ;
+ m_macTXNvars = NULL ;
m_macUsesTXN = false ;
m_editable = true ;
return FALSE;
wxSize mySize = size ;
- if ( m_macUsesTXN )
- {
- m_macHorizontalBorder = 5 ; // additional pixels around the real control
- m_macVerticalBorder = 3 ;
- }
- else
+ if ( m_macUsesTXN )
+ {
+ m_macHorizontalBorder = 5 ; // additional pixels around the real control
+ m_macVerticalBorder = 3 ;
+ }
+ else
{
m_macHorizontalBorder = 5 ; // additional pixels around the real control
m_macVerticalBorder = 5 ;
Rect bounds ;
Str255 title ;
-
+ /*
if ( mySize.y == -1 )
{
- if ( !m_macUsesTXN )
- mySize.y = 13 ;
- else
- mySize.y = 16 ;
+ mySize.y = 13 ;
+ if ( m_windowStyle & wxTE_MULTILINE )
+ mySize.y *= 5 ;
mySize.y += 2 * m_macVerticalBorder ;
}
-
+ */
MacPreControlCreate( parent , id , "" , pos , mySize ,style, validator , name , &bounds , title ) ;
if ( m_windowStyle & wxTE_MULTILINE )
m_windowStyle |= wxTE_PROCESS_ENTER;
}
+ if ( m_windowStyle & wxTE_READONLY)
+ {
+ m_editable = FALSE ;
+ }
if ( !m_macUsesTXN )
{
- m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1,
- (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
- long size ;
+ m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , "\p" , true , 0 , 0 , 1,
+ (style & wxTE_PASSWORD) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
+ long size ;
::GetControlData((ControlHandle) m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &((TEHandle) m_macTE) , &size ) ;
}
- else
- {
+ else
+ {
short featurSet;
- featurSet = kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
+ featurSet = kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
| kControlWantsActivate | kControlHandlesTracking | kControlHasSpecialBackground
| kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
/* 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 & wxTE_MULTILINE );
- }
+ mUPOpenControl((ControlHandle) m_macControl, m_windowStyle );
+ if ( parent )
+ {
+ parent->MacGetTopLevelWindow()->MacInstallEventHandler() ;
+ }
+ }
MacPostControlCreate() ;
wxString value ;
- if( wxApp::s_macDefaultEncodingIsPC )
- value = wxMacMakeMacStringFromPC( st ) ;
- else
- value = st ;
-
- if ( !m_macUsesTXN )
- {
- ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
+ if( wxApp::s_macDefaultEncodingIsPC )
+ value = wxMacMakeMacStringFromPC( st ) ;
+ else
+ value = st ;
+
+ if ( !m_macUsesTXN )
+ {
+ ::SetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
}
else
{
STPTextPaneVars **tpvars;
- /* set up locals */
+ /* set up locals */
tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);
- /* set the text in the record */
+ /* set the text in the record */
TXNSetData( (**tpvars).fTXNRec, kTXNTextData, (void*)value.c_str(), value.Length(),
kTXNStartOffset, kTXNEndOffset);
m_macTXN = (**tpvars).fTXNRec ;
m_macTXNvars = tpvars ;
m_macUsesTXN = true ;
+ TXNSetSelection( (TXNObject) m_macTXN, 0, 0);
+ TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
}
return TRUE;
wxString wxTextCtrl::GetValue() const
{
Size actualsize;
- if ( !m_macUsesTXN )
- {
- ::GetControlData( (ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 32767 , wxBuffer , &actualsize) ;
- }
- else
- {
- Handle theText ;
- OSStatus err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
- /* all done */
- if ( err )
- {
- actualsize = 0 ;
- }
- else
- {
- actualsize = GetHandleSize( theText ) ;
- strncpy( wxBuffer , *theText , actualsize ) ;
- DisposeHandle( theText ) ;
- }
- }
+
+ if ( !m_macUsesTXN )
+ {
+ ::GetControlData( (ControlHandle) m_macControl, 0,
+ ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag,
+ 32767 , wxBuffer , &actualsize ) ;
+ }
+ else
+ {
+ Handle theText ;
+ OSStatus err = TXNGetDataEncoded( ((TXNObject) m_macTXN), kTXNStartOffset, kTXNEndOffset, &theText , kTXNTextData );
+ // all done
+ if ( err )
+ {
+ actualsize = 0 ;
+ }
+ else
+ {
+ actualsize = GetHandleSize( theText ) ;
+ if (actualsize != 0)
+ strncpy( wxBuffer , *theText , actualsize ) ;
+ DisposeHandle( theText ) ;
+ }
+ }
+
wxBuffer[actualsize] = 0 ;
+
+ wxString value;
+
if( wxApp::s_macDefaultEncodingIsPC )
- return wxMacMakePCStringFromMac( wxBuffer ) ;
+ {
+ value = wxMacMakePCStringFromMac( wxBuffer ) ;
+ value.Replace( "\r", "\n" );
+ }
else
- return wxString(wxBuffer);
+ value = wxBuffer;
+
+
+ return value;
}
void wxTextCtrl::GetSelection(long* from, long* to) const
void wxTextCtrl::SetValue(const wxString& st)
{
- wxString value ;
+ wxString value;
if( wxApp::s_macDefaultEncodingIsPC )
+ {
value = wxMacMakeMacStringFromPC( st ) ;
+ value.Replace( "\n", "\r" );
+ }
else
- value = st ;
- if ( !m_macUsesTXN )
- {
- ::SetControlData((ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
- }
- else
- {
- TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(),
- kTXNStartOffset, kTXNEndOffset);
- }
+ value = st;
+
+
+ if ( !m_macUsesTXN )
+ {
+ ::SetControlData((ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
+ }
+ else
+ {
+ bool formerEditable = IsEditable() ;
+ 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);
+ if ( !formerEditable )
+ SetEditable(formerEditable) ;
+ }
MacRedrawControl() ;
}
+void wxTextCtrl::SetMaxLength(unsigned long len)
+{
+ m_maxLength = len ;
+}
+
+bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
+{
+ if ( m_macUsesTXN )
+ {
+ bool formerEditable = IsEditable() ;
+ 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" ) ;
+ }
+ if ( !formerEditable )
+ SetEditable(formerEditable) ;
+ }
+ return TRUE ;
+}
+
+bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
+{
+ wxTextCtrlBase::SetDefaultStyle( style ) ;
+ SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;
+ return TRUE ;
+}
+
// Clipboard operations
void wxTextCtrl::Copy()
{
{
if ( !m_macUsesTXN )
{
- TECopy( ((TEHandle) m_macTE) ) ;
- ClearCurrentScrap();
- TEToScrap() ;
- MacRedrawControl() ;
- }
- else
- {
+ TECopy( ((TEHandle) m_macTE) ) ;
+ ClearCurrentScrap();
+ TEToScrap() ;
+ MacRedrawControl() ;
+ }
+ else
+ {
ClearCurrentScrap();
TXNCopy((TXNObject)m_macTXN);
TXNConvertToPublicScrap();
- }
+ }
}
}
{
if ( !m_macUsesTXN )
{
- TECut( ((TEHandle) m_macTE) ) ;
- ClearCurrentScrap();
- TEToScrap() ;
- MacRedrawControl() ;
+ TECut( ((TEHandle) m_macTE) ) ;
+ ClearCurrentScrap();
+ TEToScrap() ;
+ MacRedrawControl() ;
}
- else
- {
+ else
+ {
ClearCurrentScrap();
TXNCut((TXNObject)m_macTXN);
TXNConvertToPublicScrap();
- }
+ }
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
event.SetString( GetValue() ) ;
event.SetEventObject( this );
GetEventHandler()->ProcessEvent(event);
- }
+ }
}
void wxTextCtrl::Paste()
TEPaste( (TEHandle) m_macTE ) ;
MacRedrawControl() ;
}
- else
- {
+ else
+ {
TXNConvertFromPublicScrap();
TXNPaste((TXNObject)m_macTXN);
- }
+ SetStyle( kTXNUseCurrentSelection , kTXNUseCurrentSelection , GetDefaultStyle() ) ;
+ }
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
event.SetString( GetValue() ) ;
event.SetEventObject( this );
if (!IsEditable())
return FALSE;
- long offset ;
#if TARGET_CARBON
OSStatus err = noErr;
ScrapRef scrapRef;
err = GetCurrentScrap( &scrapRef );
if ( err != noTypeErr && err != memFullErr )
{
- ScrapFlavorFlags flavorFlags;
- Size byteCount;
+ ScrapFlavorFlags flavorFlags;
+ Size byteCount;
if (( err = GetScrapFlavorFlags( scrapRef, 'TEXT', &flavorFlags )) == noErr)
{
return FALSE;
#else
+ long offset ;
if ( GetScrap( NULL , 'TEXT' , &offset ) > 0 )
{
return TRUE ;
if ( editable != m_editable )
{
m_editable = editable ;
- if ( editable )
- UMAActivateControl( (ControlHandle) m_macControl ) ;
+ if ( !m_macUsesTXN )
+ {
+ if ( editable )
+ UMAActivateControl( (ControlHandle) m_macControl ) ;
+ else
+ UMADeactivateControl((ControlHandle) m_macControl ) ;
+ }
else
- UMADeactivateControl((ControlHandle) m_macControl ) ;
+ {
+ TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
+ TXNControlData data[] = { { editable ? kTXNReadWrite : kTXNReadOnly } } ;
+ TXNSetTXNObjectControls( (TXNObject) m_macTXN , false , sizeof(tag) / sizeof (TXNControlTag) , tag , data ) ;
+ }
}
}
{
if ( !m_macUsesTXN )
{
- ControlEditTextSelectionRec selection ;
+ ControlEditTextSelectionRec selection ;
- selection.selStart = from ;
- selection.selEnd = to ;
- ::SetControlData((ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
- TESetSelect( from , to , ((TEHandle) m_macTE) ) ;
- TEDelete( ((TEHandle) m_macTE) ) ;
- TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;
- }
- else
- {
- TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
- TXNClear( ((TXNObject) m_macTXN) ) ;
- TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(),
- kTXNUseCurrentSelection, kTXNUseCurrentSelection);
- }
+ selection.selStart = from ;
+ selection.selEnd = to ;
+ ::SetControlData((ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
+ TESetSelect( from , to , ((TEHandle) m_macTE) ) ;
+ TEDelete( ((TEHandle) m_macTE) ) ;
+ TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;
+ }
+ else
+ {
+ bool formerEditable = IsEditable() ;
+ 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() ;
}
{
if ( !m_macUsesTXN )
{
- ControlEditTextSelectionRec selection ;
+ ControlEditTextSelectionRec selection ;
- selection.selStart = from ;
- selection.selEnd = to ;
- ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
- TEDelete( ((TEHandle) m_macTE) ) ;
+ selection.selStart = from ;
+ selection.selEnd = to ;
+ ::SetControlData( (ControlHandle) m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
+ TEDelete( ((TEHandle) m_macTE) ) ;
}
else
{
+ bool formerEditable = IsEditable() ;
+ if ( !formerEditable )
+ SetEditable(true) ;
TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
TXNClear( ((TXNObject) m_macTXN) ) ;
+ if ( !formerEditable )
+ SetEditable( formerEditable ) ;
}
Refresh() ;
}
}
else
{
- STPTextPaneVars **tpvars;
- /* set up our locals */
- tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);
- /* and our drawing environment as the operation
- may force a redraw in the text area. */
- SetPort((**tpvars).fDrawingEnvironment);
- /* change the selection */
- TXNSetSelection( (**tpvars).fTXNRec, from, to);
+ STPTextPaneVars **tpvars;
+ /* set up our locals */
+ tpvars = (STPTextPaneVars **) GetControlReference((ControlHandle) m_macControl);
+ /* and our drawing environment as the operation
+ may force a redraw in the text area. */
+ SetPort((**tpvars).fDrawingEnvironment);
+ /* change the selection */
+ TXNSetSelection( (**tpvars).fTXNRec, from, to);
+ TXNShowSelection( (TXNObject) m_macTXN, kTXNShowStart);
}
}
void wxTextCtrl::WriteText(const wxString& text)
{
wxString value ;
- if( wxApp::s_macDefaultEncodingIsPC )
- value = wxMacMakeMacStringFromPC( text ) ;
- else
- value = text ;
+ if( wxApp::s_macDefaultEncodingIsPC )
+ {
+ value = wxMacMakeMacStringFromPC( text ) ;
+ value.Replace( "\n", "\r" );
+ }
+ else
+ value = text ;
+
if ( !m_macUsesTXN )
{
- TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;
- }
- else
- {
- TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*) (const char*)value, value.Length(),
- kTXNUseCurrentSelection, kTXNUseCurrentSelection);
- }
- MacRedrawControl() ;
+ TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;
+ }
+ else
+ {
+ bool formerEditable = IsEditable() ;
+ 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 ) ;
+ SetStyle( start , end , GetDefaultStyle() ) ;
+ if ( !formerEditable )
+ SetEditable( formerEditable ) ;
+ }
+ MacRedrawControl() ;
}
void wxTextCtrl::AppendText(const wxString& text)
}
if ( !m_macUsesTXN )
{
- ::SetControlData((ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;
+ ::SetControlData((ControlHandle) m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , 0 , (char*) ((const char*)NULL) ) ;
}
else
{
- ClearCurrentScrap();
- TXNClear((TXNObject)m_macTXN);
+ TXNSetSelection( (TXNObject)m_macTXN , kTXNStartOffset , kTXNEndOffset ) ;
+ TXNClear((TXNObject)m_macTXN);
}
Refresh() ;
}
{
int wText = 100 ;
- int hText ;
- if ( UMAHasAppearance() )
- hText = 13 ;
- else
- hText = 24 ;
- hText += 2 * m_macHorizontalBorder ;
+ int hText;
+ if ( m_macUsesTXN )
+ {
+ hText = 17 ;
+ }
+ else
+ {
+ hText = 13 ;
+ }
/*
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
*/
if ( m_windowStyle & wxTE_MULTILINE )
{
- hText *= wxMin(GetNumberOfLines(), 5);
+ hText *= 5 ;
}
+ hText += 2 * m_macVerticalBorder ;
+ wText += 2 * m_macHorizontalBorder ;
//else: for single line control everything is ok
return wxSize(wText, hText);
}
wxString content = GetValue() ;
int count = 1;
- for (int i = 0; i < content.Length() ; i++)
- {
- if (content[i] == '\r') count++;
+ for (size_t i = 0; i < content.Length() ; i++)
+ {
+ if (content[i] == '\r') count++;
}
return count;
{
// TODO change this if possible to reflect real lines
wxString content = GetValue() ;
-
- // Find line first
- int count = 0;
- for (int i = 0; i < content.Length() ; i++)
+
+ // Find line first
+ int count = 0;
+ 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;
- }
-
- return count;
- }
- if (content[i] == '\r') count++;
- }
+ if (content[j] == '\r') return count;
+ }
+
+ return count;
+ }
+ if (content[i] == '\r') count++;
+ }
return 0;
}
// TODO change this if possible to reflect real lines
wxString content = GetValue() ;
- // Find line first
- int count = 0;
- for (int i = 0; i < content.Length() ; i++)
+ // Find line first
+ int count = 0;
+ 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++)
- {
- if (content[j] == '\r')
- return tmp;
-
- tmp += content[j];
- }
-
- return tmp;
- }
- if (content[i] == '\r') count++;
- }
+ for (size_t j = i; j < content.Length(); j++)
+ {
+ if (content[j] == '\r')
+ return tmp;
+
+ tmp += content[j];
+ }
+
+ return tmp;
+ }
+ if (content[i] == '\r') count++;
+ }
+ return "" ;
}
/*
int key = event.GetKeyCode() ;
bool eat_key = false ;
+ if ( key == 'c' && event.MetaDown() )
+ {
+ if ( CanCopy() )
+ Copy() ;
+ return ;
+ }
+
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 */
// eat it
return ;
}
+ if ( key == 'v' && event.MetaDown() )
+ {
+ if ( CanPaste() )
+ Paste() ;
+ return ;
+ }
+ if ( key == 'x' && event.MetaDown() )
+ {
+ if ( CanCut() )
+ Cut() ;
+ return ;
+ }
switch ( key )
{
case WXK_RETURN:
break;
}
- EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent();
- short keychar = short(ev->message & charCodeMask);
if (!eat_key)
{
- short keycode = short(ev->message & keyCodeMask) >> 8 ;
- ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers );
+ // default handling
+ event.Skip() ;
}
- if ( keychar >= 0x20 ||
- event.KeyCode() == WXK_RETURN ||
- event.KeyCode() == WXK_DELETE ||
- event.KeyCode() == WXK_BACK)
+ if ( ( key >= 0x20 && key < WXK_START ) ||
+ key == WXK_RETURN ||
+ key == WXK_DELETE ||
+ key == WXK_BACK)
{
wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
event1.SetString( GetValue() ) ;
event1.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event1);
+ wxPostEvent(GetEventHandler(),event1);
+ }
+}
+
+void wxTextCtrl::MacSuperShown( bool show )
+{
+ bool former = m_macControlIsShown ;
+ wxControl::MacSuperShown( show ) ;
+ if ( (former != m_macControlIsShown) && m_macUsesTXN )
+ {
+ if ( m_macControlIsShown )
+ TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,
+ (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom,(**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
+ else
+ TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,
+ (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
}
}
+bool wxTextCtrl::Show(bool show)
+{
+ bool former = m_macControlIsShown ;
+
+ bool retval = wxControl::Show( show ) ;
+
+ if ( former != m_macControlIsShown && show )
+ {
+ if ( m_macControlIsShown )
+ TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,
+ (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom,(**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
+ else
+ TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,
+ (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.bottom + 30000, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.right, (**(STPTextPaneVars **)m_macTXNvars).fTXNFrame);
+ }
+
+ return retval ;
+}
+
// ----------------------------------------------------------------------------
// 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