X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fba8e95e92adcdfdd3507c26a6e8cefabbbfef57..191e43fd02e958cd302049c469fb0f5ca9b67ceb:/samples/html/htmlctrl/htmlctrl.cpp?ds=sidebyside

diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
old mode 100755
new mode 100644
index 055a977795..8c50bee322
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -32,16 +32,14 @@
 
 #include "wx/html/webkit.h"
 
+#ifndef __WXMSW__
+    #include "../../sample.xpm"
+#endif
+
 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------
 
-// the application icon (under Windows and OS/2 it is in resources and even
-// though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
-    #include "../../sample.xpm"
-#endif
-
 enum {
     ID_BACK = wxID_HIGHEST + 1,
     ID_NEXT = wxID_HIGHEST + 2,
@@ -53,7 +51,7 @@ enum {
     ID_OPEN = wxID_HIGHEST + 8,
     ID_SAVE = wxID_HIGHEST + 9,
     ID_SET_SOURCE = wxID_HIGHEST + 10
-    };
+};
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -131,6 +129,9 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxWebKit Sample"));
 
@@ -152,20 +153,22 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title)
        : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(500,500))
 {
+    SetIcon(wxICON(sample));
+
     wxMenuBar* myBar = new wxMenuBar();
     wxMenu* fileMenu = new wxMenu;
     fileMenu->Append(ID_OPEN, _("&Open"));
     fileMenu->Append(ID_SAVE, _("&Save"));
     myBar->Append(fileMenu, _("&File"));
-    
+
     wxMenu* editMenu = new wxMenu;
     editMenu->Append(ID_SET_SOURCE, _("Set Page Source"));
     myBar->Append(editMenu, _("&Edit"));
-    
+
     //wxMenu* viewMenu = new wxMenu(_("View"));
     //viewMenu->Append(ID_VIEW_SOURCE, _("View Source"));
     //myBar->Append(viewMenu, _("View"));
-    
+
     SetMenuBar(myBar);
 
     wxToolBar* myToolbar = CreateToolBar();
@@ -186,7 +189,23 @@ MyFrame::MyFrame(const wxString& title)
     myToolbar->AddSeparator();
     myToolbar->Realize();
 
+    // 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);
@@ -208,7 +227,7 @@ void MyFrame::OnStopButton(wxCommandEvent& myEvent){
 }
 
 void MyFrame::OnReloadButton(wxCommandEvent& myEvent){
-	mySafari->Reload();
+    mySafari->Reload();
 }
 
 void MyFrame::OnURLEnter(wxCommandEvent& myEvent){