Add wxDataViewCtrl::ExpandAncestors() and call it from both EnsureVisible() and Select()

[wxWidgets.git] / src / univ / control.cpp

diff --git a/src/univ/control.cpp b/src/univ/control.cpp
index 8e2a06e9de8a2f6a1042af3dafb0f60a95cc842d..fa8ae7b38437d7ddc3919efa0f26792b7492a475 100644 (file)
--- a/src/univ/control.cpp
+++ b/src/univ/control.cpp
@@ -78,51 +78,6 @@ bool wxControl::Create(wxWindow *parent,
 // mnemonics handling
 // ----------------------------------------------------------------------------
 
-/* static */
-int wxControl::FindAccelIndex(const wxString& label, wxString *labelOnly)
-{
-    // the character following MNEMONIC_PREFIX is the accelerator for this
-    // control unless it is MNEMONIC_PREFIX too - this allows to insert
-    // literal MNEMONIC_PREFIX chars into the label
-    static const wxChar MNEMONIC_PREFIX = _T('&');
-
-    if ( labelOnly )
-    {
-        labelOnly->Empty();
-        labelOnly->Alloc(label.length());
-    }
-
-    int indexAccel = -1;
-    for ( wxString::const_iterator pc = label.begin(); pc != label.end(); ++pc )
-    {
-        if ( *pc == MNEMONIC_PREFIX )
-        {
-            ++pc; // skip it
-            if ( pc == label.end() )
-                break;
-            else if ( *pc != MNEMONIC_PREFIX )
-            {
-                if ( indexAccel == -1 )
-                {
-                    // remember it (-1 is for MNEMONIC_PREFIX itself
-                    indexAccel = pc - label.begin() - 1;
-                }
-                else
-                {
-                    wxFAIL_MSG(_T("duplicate accel char in control label"));
-                }
-            }
-        }
-
-        if ( labelOnly )
-        {
-            *labelOnly += *pc;
-        }
-    }
-
-    return indexAccel;
-}
-
 void wxControl::SetLabel(const wxString& label)
 {
     // save original label