From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 23 Jul 2012 15:03:09 +0000 (+0000)
Subject: Fix assert in webview sample when viewing pages without a title.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/14a0b47dffe3faf3a921719df5eec7c2ec260421?ds=inline

Fix assert in webview sample when viewing pages without a title.

Trying to append a menu item with empty label resulted in an assert (at least
under wxGTK but probably elsewhere too), and in any case wasn't very useful,
so use "(untitled)" instead in this case.

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

diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
index de03b11709..e3db1d0451 100644
--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@@ -641,7 +641,10 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
                 wxCommandEventHandler(WebFrame::OnHistory), NULL, this );
     }
 
-    item = m_tools_history_menu->AppendRadioItem(wxID_ANY, m_browser->GetCurrentTitle());
+    wxString title = m_browser->GetCurrentTitle();
+    if ( title.empty() )
+        title = "(untitled)";
+    item = m_tools_history_menu->AppendRadioItem(wxID_ANY, title);
     item->Check();
 
     //No need to connect the current item