removed patch 1373127

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

diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index f8fca4598241e3b7ade8557e947f0531597a0e69..11d195c1433c13824e852eb23324f9ce65f97e8f 100755 (executable)
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -36,12 +36,6 @@
 // resources
 // ----------------------------------------------------------------------------
 
 // 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,
 enum {
     ID_BACK = wxID_HIGHEST + 1,
     ID_NEXT = wxID_HIGHEST + 2,


@@ -188,7 +182,7 @@ MyFrame::MyFrame(const wxString& title)
 
     // Testing wxWebKitCtrl inside a panel
 #if 1
 
     // Testing wxWebKitCtrl inside a panel
 #if 1

-    wxPanel* panel = new wxPanel(this, -1);
+    wxPanel* panel = new wxPanel(this, wxID_ANY);

 
     wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
     panel->SetSizer(boxSizer);
 
     wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
     panel->SetSizer(boxSizer);


@@ -224,7 +218,7 @@ void MyFrame::OnStopButton(wxCommandEvent& myEvent){
 }
 
 void MyFrame::OnReloadButton(wxCommandEvent& myEvent){
 }
 
 void MyFrame::OnReloadButton(wxCommandEvent& myEvent){

-       mySafari->Reload();
+    mySafari->Reload();

 }
 
 void MyFrame::OnURLEnter(wxCommandEvent& myEvent){
 }
 
 void MyFrame::OnURLEnter(wxCommandEvent& myEvent){