Smartphone fix due to separated implementation of wxFileDialog.

[wxWidgets.git] / samples / html / htmlctrl / htmlctrl.cpp

diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index 83687c029f3b1ee40c95cd3fc0eb83d0ffeb5425..775db9ccad011b330b5c335931878887db621211 100755 (executable)
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -186,8 +186,24 @@ MyFrame::MyFrame(const wxString& title)
     myToolbar->AddSeparator();
     myToolbar->Realize();
 
-    mySafari = new wxWebKitCtrl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+    // Testing wxWebKitCtrl inside a panel
+#if 1
+    wxPanel* panel = new wxPanel(this, wxID_ANY);
+
+    wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
+    panel->SetSizer(boxSizer);
+
+    mySafari = new wxWebKitCtrl(panel, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+
+    boxSizer->Add(mySafari, 1, wxEXPAND);
 
+    wxBoxSizer* frameSizer = new wxBoxSizer(wxVERTICAL);
+    SetSizer(frameSizer);
+    frameSizer->Add(panel, 1, wxEXPAND);
+#else
+    mySafari = new wxWebKitCtrl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+#endif
+    
 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR
@@ -208,7 +224,7 @@ void MyFrame::OnStopButton(wxCommandEvent& myEvent){
 }
 
 void MyFrame::OnReloadButton(wxCommandEvent& myEvent){
-       mySafari->Reload();
+    mySafari->Reload();
 }
 
 void MyFrame::OnURLEnter(wxCommandEvent& myEvent){
@@ -219,6 +235,7 @@ void MyFrame::OnStateChanged(wxWebKitStateChangedEvent& myEvent){
     if (GetStatusBar() != NULL){
         if (myEvent.GetState() == wxWEBKIT_STATE_NEGOTIATING){
             GetStatusBar()->SetStatusText(_("Contacting ") + myEvent.GetURL());
+            urlText->SetValue(myEvent.GetURL());
         }
         else if (myEvent.GetState() == wxWEBKIT_STATE_TRANSFERRING){
             GetStatusBar()->SetStatusText(_("Loading ") + myEvent.GetURL());