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

Remove old workarounds to get cut, copy, and paste working in embedded wxTextCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-10-15 16:07:26 +00:00
parent c39058f631
commit 174b59acee
3 changed files with 35 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/propgrid/propgrid.h
View File

@@ -418,13 +418,10 @@ enum wxPG_KEYBOARD_ACTIONS
wxPG_ACTION_EXPAND_PROPERTY, wxPG_ACTION_EXPAND_PROPERTY,
wxPG_ACTION_COLLAPSE_PROPERTY, wxPG_ACTION_COLLAPSE_PROPERTY,
wxPG_ACTION_CANCEL_EDIT, wxPG_ACTION_CANCEL_EDIT,
wxPG_ACTION_CUT,
wxPG_ACTION_COPY,
wxPG_ACTION_PASTE,
wxPG_ACTION_PRESS_BUTTON, // Causes editor button (if any) to be pressed wxPG_ACTION_PRESS_BUTTON, // Causes editor button (if any) to be pressed
wxPG_ACTION_MAX wxPG_ACTION_MAX
}; };
/** @} /** @}
*/ */

3
interface/wx/propgrid/propgrid.h
View File

@@ -265,9 +265,6 @@ enum wxPG_KEYBOARD_ACTIONS
wxPG_ACTION_EXPAND_PROPERTY, wxPG_ACTION_EXPAND_PROPERTY,
wxPG_ACTION_COLLAPSE_PROPERTY, wxPG_ACTION_COLLAPSE_PROPERTY,
wxPG_ACTION_CANCEL_EDIT, wxPG_ACTION_CANCEL_EDIT,
wxPG_ACTION_CUT,
wxPG_ACTION_COPY,
wxPG_ACTION_PASTE,
wxPG_ACTION_MAX wxPG_ACTION_MAX
}; };

150
src/propgrid/propgrid.cpp
View File

@@ -579,12 +579,6 @@ void wxPropertyGrid::Init1()
AddActionTrigger( wxPG_ACTION_EXPAND_PROPERTY, WXK_RIGHT); AddActionTrigger( wxPG_ACTION_EXPAND_PROPERTY, WXK_RIGHT);
AddActionTrigger( wxPG_ACTION_COLLAPSE_PROPERTY, WXK_LEFT); AddActionTrigger( wxPG_ACTION_COLLAPSE_PROPERTY, WXK_LEFT);
AddActionTrigger( wxPG_ACTION_CANCEL_EDIT, WXK_ESCAPE ); AddActionTrigger( wxPG_ACTION_CANCEL_EDIT, WXK_ESCAPE );
AddActionTrigger( wxPG_ACTION_CUT, 'X', wxMOD_CONTROL );
AddActionTrigger( wxPG_ACTION_CUT, WXK_DELETE, wxMOD_SHIFT );
AddActionTrigger( wxPG_ACTION_COPY, 'C', wxMOD_CONTROL);
AddActionTrigger( wxPG_ACTION_COPY, WXK_INSERT, wxMOD_CONTROL );
AddActionTrigger( wxPG_ACTION_PASTE, 'V', wxMOD_CONTROL );
AddActionTrigger( wxPG_ACTION_PASTE, WXK_INSERT, wxMOD_SHIFT );
AddActionTrigger( wxPG_ACTION_PRESS_BUTTON, WXK_DOWN, wxMOD_ALT ); AddActionTrigger( wxPG_ACTION_PRESS_BUTTON, WXK_DOWN, wxMOD_ALT );
AddActionTrigger( wxPG_ACTION_PRESS_BUTTON, WXK_F4 ); AddActionTrigger( wxPG_ACTION_PRESS_BUTTON, WXK_F4 );
@@ -4971,17 +4965,6 @@ void wxPropertyGrid::ClearActionTriggers( int action )
} }
} }
static void CopyTextToClipboard( const wxString& text )
{
if ( wxTheClipboard->Open() )
{
// This data objects are held by the clipboard,
// so do not delete them in the app.
wxTheClipboard->SetData( new wxTextDataObject(text) );
wxTheClipboard->Close();
}
}
void wxPropertyGrid::HandleKeyEvent(wxKeyEvent &event) void wxPropertyGrid::HandleKeyEvent(wxKeyEvent &event)
{ {
// //
@@ -5022,54 +5005,47 @@ void wxPropertyGrid::HandleKeyEvent(wxKeyEvent &event)
wxPGProperty* p = m_selected; wxPGProperty* p = m_selected;
if ( action == wxPG_ACTION_COPY ) // Travel and expand/collapse
int selectDir = -2;
if ( p->GetChildCount() &&
!(p->m_flags & wxPG_PROP_DISABLED)
)
{ {
CopyTextToClipboard(p->GetDisplayedString()); if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY )
{
if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Collapse(p) )
keycode = 0;
}
else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY )
{
if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Expand(p) )
keycode = 0;
}
} }
else
if ( keycode )
{ {
// Travel and expand/collapse if ( action == wxPG_ACTION_PREV_PROPERTY || secondAction == wxPG_ACTION_PREV_PROPERTY )
int selectDir = -2;
if ( p->GetChildCount() &&
!(p->m_flags & wxPG_PROP_DISABLED)
)
{ {
if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY ) selectDir = -1;
{ }
if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Collapse(p) ) else if ( action == wxPG_ACTION_NEXT_PROPERTY || secondAction == wxPG_ACTION_NEXT_PROPERTY )
keycode = 0; {
} selectDir = 1;
else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY ) }
{ else
if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Expand(p) ) {
keycode = 0; event.Skip();
}
} }
if ( keycode ) }
{
if ( action == wxPG_ACTION_PREV_PROPERTY || secondAction == wxPG_ACTION_PREV_PROPERTY )
{
selectDir = -1;
}
else if ( action == wxPG_ACTION_NEXT_PROPERTY || secondAction == wxPG_ACTION_NEXT_PROPERTY )
{
selectDir = 1;
}
else
{
event.Skip();
}
} if ( selectDir >= -1 )
{
if ( selectDir >= -1 ) p = wxPropertyGridIterator::OneStep( m_pState, wxPG_ITERATE_VISIBLE, p, selectDir );
{ if ( p )
p = wxPropertyGridIterator::OneStep( m_pState, wxPG_ITERATE_VISIBLE, p, selectDir ); DoSelectProperty(p);
if ( p )
DoSelectProperty(p);
}
} }
} }
else else
@@ -5122,64 +5098,6 @@ bool wxPropertyGrid::HandleChildKey( wxKeyEvent& event )
res = false; res = false;
UnfocusEditor(); UnfocusEditor();
} }
else if ( action == wxPG_ACTION_COPY )
{
// NB: There is some problem with getting native cut-copy-paste keys to go through
// for embedded editor wxTextCtrl. This is why we emulate.
//
wxTextCtrl* tc = GetEditorTextCtrl();
if ( tc )
{
wxString sel = tc->GetStringSelection();
if ( sel.length() )
CopyTextToClipboard(sel);
}
else
{
CopyTextToClipboard(m_selected->GetDisplayedString());
}
}
else if ( action == wxPG_ACTION_CUT )
{
wxTextCtrl* tc = GetEditorTextCtrl();
if ( tc )
{
long from, to;
tc->GetSelection(&from, &to);
if ( from < to )
{
CopyTextToClipboard(tc->GetStringSelection());
tc->Remove(from, to);
}
}
}
else if ( action == wxPG_ACTION_PASTE )
{
wxTextCtrl* tc = GetEditorTextCtrl();
if ( tc )
{
if (wxTheClipboard->Open())
{
if (wxTheClipboard->IsSupported( wxDF_TEXT ))
{
wxTextDataObject data;
wxTheClipboard->GetData( data );
long from, to;
tc->GetSelection(&from, &to);
if ( from < to )
{
tc->Remove(from, to);
tc->WriteText(data.GetText());
}
else
{
tc->WriteText(data.GetText());
}
}
wxTheClipboard->Close();
}
}
}
return res; return res;
} }