Enclosed control in a panel to demonstrate display glitches

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

diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index 055a9777950e79a64612f255b0cb39019329d1f6..f8fca4598241e3b7ade8557e947f0531597a0e69 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();
 
     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, -1);
+
+    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
 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR