Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for 10.4 provided context menu

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-11-03 14:23:22 +00:00
parent fa349e95cc
commit 64bd657c27
1 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mac/carbon/textctrl.cpp
View File

@@ -183,6 +183,7 @@ public :
virtual void SetSelection( long from , long to ) = 0 ; virtual void SetSelection( long from , long to ) = 0 ;
virtual void GetSelection( long* from, long* to) const = 0 ; virtual void GetSelection( long* from, long* to) const = 0 ;
virtual void WriteText(const wxString& str) = 0 ; virtual void WriteText(const wxString& str) = 0 ;
virtual bool HasOwnContextMenu() const { return false ; }
virtual void Clear() ; virtual void Clear() ;
virtual bool CanUndo() const; virtual bool CanUndo() const;
@@ -236,6 +237,19 @@ public :
virtual void SetSelection( long from , long to ) ; virtual void SetSelection( long from , long to ) ;
virtual void WriteText(const wxString& str) ; virtual void WriteText(const wxString& str) ;
virtual bool HasOwnContextMenu() const
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( UMAGetSystemVersion() >= 0x1040 )
{
TXNCommandEventSupportOptions options ;
TXNGetCommandEventSupport( m_txn , & options ) ;
return options & kTXNSupportEditCommandProcessing ;
}
#endif
return false ;
}
virtual void Clear() ; virtual void Clear() ;
virtual bool CanUndo() const ; virtual bool CanUndo() const ;
@@ -385,7 +399,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
END_EVENT_TABLE() END_EVENT_TABLE()
// Text item // Text item
void wxTextCtrl::Init() void wxTextCtrl::Init()
{ {
m_editable = true ; m_editable = true ;
m_dirty = false; m_dirty = false;
@@ -1060,6 +1074,12 @@ void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event) void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
{ {
if ( GetPeer()->HasOwnContextMenu() )
{
event.Skip() ;
return ;
}
if (m_privateContextMenu == NULL) if (m_privateContextMenu == NULL)
{ {
m_privateContextMenu = new wxMenu; m_privateContextMenu = new wxMenu;
@@ -1643,6 +1663,21 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
tback.bgType = kTXNBackgroundTypeRGB; tback.bgType = kTXNBackgroundTypeRGB;
tback.bg.color = MAC_WXCOLORREF( background.GetPixel() ); tback.bg.color = MAC_WXCOLORREF( background.GetPixel() );
TXNSetBackground( m_txn , &tback); TXNSetBackground( m_txn , &tback);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( UMAGetSystemVersion() >= 0x1040 )
{
TXNCommandEventSupportOptions options ;
if ( TXNGetCommandEventSupport( m_txn, &options) == noErr )
{
options |= kTXNSupportEditCommandProcessing ;
options |= kTXNSupportSpellCheckCommandProcessing ;
options |= kTXNSupportFontCommandProcessing ;
options |= kTXNSupportFontCommandUpdating ;
TXNSetCommandEventSupport( m_txn , options ) ;
}
}
#endif
} }
void wxMacMLTEControl::SetBackground( const wxBrush &brush ) void wxMacMLTEControl::SetBackground( const wxBrush &brush )