class wxMacFunctor
{
public :
- wxMacFunctor(){}
+ wxMacFunctor() {}
virtual ~wxMacFunctor() {}
virtual void* operator()() = 0 ;
static void* CallBackProc(void *param)
(m_object->*m_function)(m_param1) ;
return NULL ;
}
+
private :
classtype* m_object ;
param1type m_param1 ;
wxMutexGuiEnter() ;
return result ;
}
+
// common interface for all implementations
class wxMacTextControl : public wxMacControl
{
virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
virtual bool HasFocus() const ;
virtual void SetBackground( const wxBrush &brush) ;
+
protected :
HIViewRef m_scrollView ;
HIViewRef m_textView ;
virtual void GetSelection( long* from, long* to) const ;
virtual void SetSelection( long from , long to ) ;
virtual void WriteText(const wxString& str) ;
+
protected :
// contains the tag for the content (is different for password and non-password controls)
OSType m_valueTag ;
void MacFocusPaneText(Boolean setFocus) ;
void MacSetObjectVisibility(Boolean vis) ;
+
private :
TXNFrameID m_txnFrameID ;
GrafPtr m_txnPort ;
END_EVENT_TABLE()
// Text item
-void wxTextCtrl::Init()
+void wxTextCtrl::Init()
{
m_editable = true ;
m_dirty = false;
delete m_privateContextMenu;
}
-
bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
const wxString& str,
const wxPoint& pos,
MacSuperChangedPosition() ;
if ( m_windowStyle & wxTE_READONLY)
- {
SetEditable( false ) ;
- }
SetCursor( wxCursor( wxCURSOR_IBEAM ) ) ;
void wxTextCtrl::Copy()
{
if (CanCopy())
- {
GetPeer()->Copy() ;
- }
}
void wxTextCtrl::Cut()
bool wxTextCtrl::CanCut() const
{
if ( !IsEditable() )
- {
return false ;
- }
+
// Can cut if there's a selection
long from, to;
GetSelection(& from, & to);
bool wxTextCtrl::LoadFile(const wxString& file)
{
if ( wxTextCtrlBase::LoadFile(file) )
- {
return true;
- }
return false;
}
int hText;
- // these are the numbers from the HIG, we reduce them by the borders
- // first
+ // these are the numbers from the HIG:
+ // we reduce them by the borders first
switch( m_windowVariant )
{
case wxWINDOW_VARIANT_NORMAL :
hText = 22 - 6 ;
break ;
+
case wxWINDOW_VARIANT_SMALL :
hText = 19 - 6 ;
break ;
+
case wxWINDOW_VARIANT_MINI :
hText= 15 - 6 ;
break ;
+
default :
hText = 22 - 6;
break ;
// as the above numbers have some free space around the text
// we get 5 lines like this anyway
if ( m_windowStyle & wxTE_MULTILINE )
- {
hText *= 5 ;
- }
if ( !HasFlag(wxNO_BORDER) )
hText += 6 ;
void wxTextCtrl::Undo()
{
if (CanUndo())
- {
GetPeer()->Undo() ;
- }
}
void wxTextCtrl::Redo()
{
if (CanRedo())
- {
GetPeer()->Redo() ;
- }
}
bool wxTextCtrl::CanUndo() const
{
if ( !IsEditable() )
- {
return false ;
- }
+
return GetPeer()->CanUndo() ;
}
bool wxTextCtrl::CanRedo() const
{
if ( !IsEditable() )
- {
return false ;
- }
+
return GetPeer()->CanRedo() ;
}
return GetPeer()->GetLineText(lineNo) ;
}
-/*
- * Text item
- */
-
void wxTextCtrl::Command(wxCommandEvent & event)
{
SetValue (event.GetString());
{
// By default, load the first file into the text window.
if (event.GetNumberOfFiles() > 0)
- {
LoadFile(event.GetFiles()[0]);
- }
}
void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
Cut() ;
return ;
}
+
switch ( key )
{
case WXK_RETURN:
// text control
eat_key = true;
}
-
break;
case WXK_TAB:
// be inserted.
WriteText(wxT("\t"));
}
+ break;
+ default:
break;
}
}
}
}
+
if ( ( key >= 0x20 && key < WXK_START ) ||
key == WXK_RETURN ||
key == WXK_DELETE ||
event.Enable(GetLastPosition() > 0);
}
-// CS: Context Menus only work with mlte implementations or non-multiline HIViews at the moment
+// CS: Context Menus only work with MLTE implementations or non-multiline HIViews at the moment
void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
{
else
return true ;
}
+
#if !TARGET_API_MAC_OSX
// user pane implementation
}
#endif
+
// ----------------------------------------------------------------------------
// implementation base class
// ----------------------------------------------------------------------------
return false ;
}
-void wxMacTextControl::Undo() { }
+void wxMacTextControl::Undo()
+{
+}
bool wxMacTextControl::CanRedo() const
{
{
if (content[i] == '\r') lines++;
}
+
return lines ;
}
return tmp;
}
+
if (content[i] == '\n') count++;
}
+
return wxEmptyString ;
}
-int wxMacTextControl::GetLineLength(long lineNo) const
+int wxMacTextControl::GetLineLength(long lineNo) const
{
// TODO change this if possible to reflect real lines
wxString content = GetStringValue() ;
for (size_t j = i; j < content.Length(); j++)
{
count++;
- if (content[j] == '\n') return count;
+ if (content[j] == '\n')
+ return count;
}
return count;
}
+
if (content[i] == '\n') count++;
}
+
return 0 ;
}
CreateEditUnicodeTextControl( MAC_WXHWND(wxPeer->MacGetTopLevelWindowRef()), &bounds , cfr , isPassword , NULL , &m_controlRef ) ;
if ( !(m_windowStyle & wxTE_MULTILINE) )
- {
SetData<Boolean>( kControlEditTextPart , kControlEditTextSingleLineTag , true ) ;
- }
}
wxMacUnicodeTextControl::~wxMacUnicodeTextControl()
CFRelease( value ) ;
}
}
+
wxString wxMacUnicodeTextControl::GetStringValue() const
{
wxString result ;
wxMacCFStringHolder cf(value) ;
result = cf.AsString() ;
}
+
#if '\n' == 10
wxMacConvertNewlines13To10( &result ) ;
#else
wxMacConvertNewlines10To13( &result ) ;
#endif
+
return result ;
}
+
void wxMacUnicodeTextControl::SetStringValue( const wxString &str)
{
wxString st = str ;
wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;
}
+
void wxMacUnicodeTextControl::Copy()
{
SendHICommand( kHICommandCopy ) ;
}
+
void wxMacUnicodeTextControl::Cut()
{
SendHICommand( kHICommandCut ) ;
}
+
void wxMacUnicodeTextControl::Paste()
{
SendHICommand( kHICommandPaste ) ;
}
+
bool wxMacUnicodeTextControl::CanPaste() const
{
return true ;
}
+
void wxMacUnicodeTextControl::SetEditable(bool editable)
{
SetData<Boolean>( 0 , kControlEditTextLockedTag , (Boolean) !editable ) ;
from = 0 ;
to = 32767 ; // sel has 16 bit signed values, max is 32767
}
+
sel.selStart = from ;
sel.selEnd = to ;
SetData<ControlEditTextSelectionRec>( 0 , kControlEditTextSelectionTag, &sel ) ;
// MLTE control implementation (common part)
// ----------------------------------------------------------------------------
-// if mlte is on read only , no changes at all are allowed, not even from
+// if MTLE is read only, no changes at all are allowed, not even from
// procedural API, in order to allow changes via API all the same we must undo
// the readonly status while we are executing, this class helps to do so
TXNSetTXNObjectControls( m_txn , false , 1 , tag , data ) ;
}
}
+
~wxMacEditHelper()
{
TXNControlTag tag[] = { kTXNIOPrivilegesTag } ;
if ( m_data[0].uValue == kTXNReadOnly )
- {
TXNSetTXNObjectControls( m_txn , false , 1 , tag , m_data ) ;
- }
}
+
protected :
TXNObject m_txn ;
TXNControlData m_data[1] ;
result = wxString( ptr ) ;
delete[] ptr ;
}
+
DisposeHandle( theText ) ;
}
#else
result = wxString( *theText , wxConvLocal , actualSize ) ;
HUnlock( theText ) ;
}
+
DisposeHandle( theText ) ;
}
#endif
}
+
#if '\n' == 10
wxMacConvertNewlines13To10( &result ) ;
#else
wxMacConvertNewlines10To13( &result ) ;
#endif
+
return result ;
}
tback.bgType = kTXNBackgroundTypeRGB;
tback.bg.color = MAC_WXCOLORREF( background.GetPixel() );
TXNSetBackground( m_txn , &tback);
+
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( UMAGetSystemVersion() >= 0x1040 )
{
wxMacEditHelper help(m_txn) ;
TXNSetAttribute( wxTextAttr(foreground,wxNullColour,font) , kTXNStartOffset,kTXNEndOffset ) ;
}
+
void wxMacMLTEControl::SetStyle(long start, long end, const wxTextAttr& style)
{
wxMacEditHelper help(m_txn) ;
wxMacEditHelper helper( m_txn ) ;
SetTXNData( st , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
}
+
GetSelection( &dummy , &end ) ;
// TODO SetStyle( start , end , GetDefaultStyle() ) ;
}
else
++xpos ;
}
+
return 0 ;
}
else
++xpos ;
}
+
if ( y ) *y = ypos ;
if ( x ) *x = xpos ;
}
#endif
}
-
wxString wxMacMLTEControl::GetLineText(long lineNo) const
{
wxString line ;
wxInt16 wxMacMLTEClassicControl::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
{
Point where = { y , x } ;
- ControlPartCode result;
+ ControlPartCode result = kControlNoPart;
- result = 0;
wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
- if ( textctrl == NULL )
- return 0 ;
-
- if (textctrl->MacIsReallyShown() )
+ if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
{
if (PtInRect(where, &m_txnControlBounds))
result = kControlEditTextPart ;
}
if (PtInRect(where, &m_txnControlBounds))
result = kControlEditTextPart ;
- else
- result = 0;
}
}
+
return result;
}
wxInt16 wxMacMLTEClassicControl::MacControlUserPaneTrackingProc( wxInt16 x, wxInt16 y, void* actionProc )
{
- wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
- if ( textctrl == NULL )
- return 0;
-
- ControlPartCode partCodeResult = 0;
+ ControlPartCode result = kControlNoPart;
- if (textctrl->MacIsReallyShown() )
+ wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
+ if ( (textctrl != NULL) && textctrl->MacIsReallyShown() )
{
- Point startPt = { y ,x } ;
+ Point startPt = { y , x } ;
// for compositing, we must convert these into toplevel window coordinates, because hittesting expects them
if ( textctrl->MacGetTopLevelWindow()->MacUsesCompositing() )
{
EventRecord rec ;
ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
TXNClick( m_txn, &rec );
-
}
break;
+
+ default :
+ break;
}
}
- return partCodeResult;
+
+ return result;
}
void wxMacMLTEClassicControl::MacControlUserPaneIdleProc()
{
wxTextCtrl* textctrl = (wxTextCtrl*) GetControlReference(m_controlRef);
if ( textctrl == NULL )
- return 0;
+ return kControlNoPart;
wxMacWindowClipper clipper( textctrl ) ;
wxMacWindowClipper clipper( textctrl ) ;
- ControlRef controlFocus = 0 ;
+ ControlRef controlFocus = NULL ;
GetKeyboardFocus( m_txnWindow , &controlFocus ) ;
bool wasFocused = ( controlFocus == m_controlRef ) ;
case kControlFocusNoPart:
default:
- MacFocusPaneText( false);
+ MacFocusPaneText( false );
focusResult = kControlFocusNoPart;
break;
}
m_windowStyle = style ;
Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
- short featurSet;
+ short featureSet;
- featurSet = kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
+ featureSet = kControlSupportsEmbedding | kControlSupportsFocus | kControlWantsIdle
| kControlWantsActivate | kControlHandlesTracking // | kControlHasSpecialBackground
| kControlGetsFocusOnClick | kControlSupportsLiveFeedback;
- verify_noerr( ::CreateUserPaneControl( MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()), &bounds, featurSet, &m_controlRef ) );
+ verify_noerr( ::CreateUserPaneControl( MAC_WXHWND(wxPeer->GetParent()->MacGetTopLevelWindowRef()), &bounds, featureSet, &m_controlRef ) );
DoCreate();
- AdjustCreationAttributes( *wxWHITE , true) ;
+ AdjustCreationAttributes( *wxWHITE , true ) ;
MacSetObjectVisibility( wxPeer->MacIsReallyShown() ) ;
/* set the initial settings for our private data */
- m_txnWindow =GetControlOwner(m_controlRef);
+ m_txnWindow = GetControlOwner(m_controlRef);
m_txnPort = (GrafPtr) GetWindowPort(m_txnWindow);
#ifdef __WXMAC_OSX__
TXNSetSelection( m_txn, 0, 0);
TXNShowSelection( m_txn, kTXNShowStart);
-
}
OSStatus wxMacMLTEHIViewControl::SetFocus( ControlFocusPart focusPart )
return control == m_textView ;
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
-#define kCGColorSpaceGenericRGB CFSTR("kCGColorSpaceGenericRGB")
-#endif
-
void wxMacMLTEHIViewControl::SetBackground( const wxBrush &brush )
{
wxMacMLTEControl::SetBackground( brush ) ;
projects / wxWidgets.git / blobdiff