]> git.saurik.com Git - wxWidgets.git/commitdiff
Create wxStaticText with correct label directly in wxTextSizerWrapper.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 22 Jan 2012 00:58:05 +0000 (00:58 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 22 Jan 2012 00:58:05 +0000 (00:58 +0000)
This is shorter and arguably more clear than doing it in two steps as we did
before and also works in wxUniv, unlike creating wxStaticText with empty label
and setting it later.

Closes #13858.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/textwrapper.h

index 8fe58fb13a6aead2489606ab39c99b14fc5f1589..56b7fdc2da018301ec52b8b55ca3027aa3bcd541 100644 (file)
@@ -98,9 +98,8 @@ public:
 protected:
     virtual wxWindow *OnCreateLine(const wxString& line)
     {
 protected:
     virtual wxWindow *OnCreateLine(const wxString& line)
     {
-        wxStaticText* const win = new wxStaticText(m_win, wxID_ANY, "");
-        win->SetLabelText(line);
-        return win;
+        return new wxStaticText(m_win, wxID_ANY,
+                                wxControl::EscapeMnemonics(line));
     }
 
     virtual void OnOutputLine(const wxString& line)
     }
 
     virtual void OnOutputLine(const wxString& line)