Applied [ 1867939 ] fixes for wxTreeCtrl crashes when exiting from label editing...

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

diff --git a/src/univ/control.cpp b/src/univ/control.cpp
index 558b2d20a4a955b1aba5a193893d77b5a1a8e5bf..8e2a06e9de8a2f6a1042af3dafb0f60a95cc842d 100644 (file)
--- a/src/univ/control.cpp
+++ b/src/univ/control.cpp
@@ -55,8 +55,6 @@ WX_FORWARD_TO_INPUT_CONSUMER(wxControl)
 void wxControl::Init()
 {
     m_indexAccel = -1;
 void wxControl::Init()
 {
     m_indexAccel = -1;

-
-    m_inputHandler = (wxInputHandler *)NULL;

 }
 
 bool wxControl::Create(wxWindow *parent,
 }
 
 bool wxControl::Create(wxWindow *parent,


@@ -95,17 +93,19 @@ int wxControl::FindAccelIndex(const wxString& label, wxString *labelOnly)
     }
 
     int indexAccel = -1;
     }
 
     int indexAccel = -1;

-    for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ )
+    for ( wxString::const_iterator pc = label.begin(); pc != label.end(); ++pc )

     {
         if ( *pc == MNEMONIC_PREFIX )
         {
     {
         if ( *pc == MNEMONIC_PREFIX )
         {

-            pc++; // skip it
-            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
             {
                 if ( indexAccel == -1 )
                 {
                     // remember it (-1 is for MNEMONIC_PREFIX itself

-                    indexAccel = pc - label.c_str() - 1;
+                    indexAccel = pc - label.begin() - 1;

                 }
                 else
                 {
                 }
                 else
                 {


@@ -124,6 +124,14 @@ int wxControl::FindAccelIndex(const wxString& label, wxString *labelOnly)
 }
 
 void wxControl::SetLabel(const wxString& label)
 }
 
 void wxControl::SetLabel(const wxString& label)

+{
+    // save original label
+    wxControlBase::SetLabel(label);
+
+    UnivDoSetLabel(label);
+}
+
+void wxControl::UnivDoSetLabel(const wxString& label)

 {
     wxString labelOld = m_label;
     m_indexAccel = FindAccelIndex(label, &m_label);
 {
     wxString labelOld = m_label;
     m_indexAccel = FindAccelIndex(label, &m_label);


@@ -134,9 +142,4 @@ void wxControl::SetLabel(const wxString& label)
     }
 }
 
     }
 }
 

-wxString wxControl::GetLabel() const
-{
-    return m_label;
-}
-

 #endif // wxUSE_CONTROLS
 #endif // wxUSE_CONTROLS