don't call release() on non-owned buffer in wchar_t build (closes #10964); copy utf8_...

[wxWidgets.git] / samples / html / htmlctrl / htmlctrl.cpp
diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp

index 8c50bee322f8b62977ce2112d353fe8c685e3067..cd470a349177dbcd43cfa5d8d69bfc52c6b05414 100644 (file)
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -212,55 +212,69 @@ MyFrame::MyFrame(const wxString& title)
  #endif // wxUSE_STATUSBAR
  }
  
  #endif // wxUSE_STATUSBAR
  }
  
-void MyFrame::OnBackButton(wxCommandEvent& myEvent){
+void MyFrame::OnBackButton(wxCommandEvent& WXUNUSED(myEvent))
+{
      if (mySafari->CanGoBack())
          mySafari->GoBack();
  }
  
      if (mySafari->CanGoBack())
          mySafari->GoBack();
  }
  
-void MyFrame::OnNextButton(wxCommandEvent& myEvent){
+void MyFrame::OnNextButton(wxCommandEvent& WXUNUSED(myEvent))
+{
      if (mySafari->CanGoForward())
          mySafari->GoForward();
  }
  
      if (mySafari->CanGoForward())
          mySafari->GoForward();
  }
  
-void MyFrame::OnStopButton(wxCommandEvent& myEvent){
+void MyFrame::OnStopButton(wxCommandEvent& WXUNUSED(myEvent))
+{
          mySafari->Stop();
  }
  
          mySafari->Stop();
  }
  
-void MyFrame::OnReloadButton(wxCommandEvent& myEvent){
+void MyFrame::OnReloadButton(wxCommandEvent& WXUNUSED(myEvent))
+{
      mySafari->Reload();
  }
  
      mySafari->Reload();
  }
  
-void MyFrame::OnURLEnter(wxCommandEvent& myEvent){
+void MyFrame::OnURLEnter(wxCommandEvent& WXUNUSED(myEvent))
+{
      mySafari->LoadURL(urlText->GetValue());
  }
  
      mySafari->LoadURL(urlText->GetValue());
  }
  
-void MyFrame::OnStateChanged(wxWebKitStateChangedEvent& myEvent){
-    if (GetStatusBar() != NULL){
-        if (myEvent.GetState() == wxWEBKIT_STATE_NEGOTIATING){
+void MyFrame::OnStateChanged(wxWebKitStateChangedEvent& myEvent)
+{
+    if (GetStatusBar() != NULL)
+    {
+        if (myEvent.GetState() == wxWEBKIT_STATE_NEGOTIATING)
+        {
              GetStatusBar()->SetStatusText(_("Contacting ") + myEvent.GetURL());
              urlText->SetValue(myEvent.GetURL());
          }
              GetStatusBar()->SetStatusText(_("Contacting ") + myEvent.GetURL());
              urlText->SetValue(myEvent.GetURL());
          }
-        else if (myEvent.GetState() == wxWEBKIT_STATE_TRANSFERRING){
+        else if (myEvent.GetState() == wxWEBKIT_STATE_TRANSFERRING)
+        {
              GetStatusBar()->SetStatusText(_("Loading ") + myEvent.GetURL());
          }
              GetStatusBar()->SetStatusText(_("Loading ") + myEvent.GetURL());
          }
-        else if (myEvent.GetState() == wxWEBKIT_STATE_STOP){
+        else if (myEvent.GetState() == wxWEBKIT_STATE_STOP)
+        {
              GetStatusBar()->SetStatusText(_("Load complete."));
              SetTitle(mySafari->GetTitle());
          }
              GetStatusBar()->SetStatusText(_("Load complete."));
              SetTitle(mySafari->GetTitle());
          }
-        else if (myEvent.GetState() == wxWEBKIT_STATE_FAILED){
+        else if (myEvent.GetState() == wxWEBKIT_STATE_FAILED)
+        {
              GetStatusBar()->SetStatusText(_("Failed to load ") + myEvent.GetURL());
          }
      }
  
  }
  
              GetStatusBar()->SetStatusText(_("Failed to load ") + myEvent.GetURL());
          }
      }
  
  }
  
-void MyFrame::OnViewSource(wxCommandEvent& myEvent){
+void MyFrame::OnViewSource(wxCommandEvent& WXUNUSED(myEvent))
+{
      if (mySafari->CanGetPageSource())
          wxMessageBox(mySafari->GetPageSource());
  }
  
      if (mySafari->CanGetPageSource())
          wxMessageBox(mySafari->GetPageSource());
  }
  
-void MyFrame::OnSetSource(wxCommandEvent& myEvent){
-    if (mySafari){
+void MyFrame::OnSetSource(wxCommandEvent& WXUNUSED(myEvent))
+{
+    if (mySafari)
+    {
          wxString myText = wxT("<HTML><HEAD></HEAD><BODY><P>Hello world!</P></BODY></HTML>");
          mySafari->SetPageSource(myText);
      }
          wxString myText = wxT("<HTML><HEAD></HEAD><BODY><P>Hello world!</P></BODY></HTML>");
          mySafari->SetPageSource(myText);
      }