X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/598152189f9c0dd5636842b0a9db8d9f287111de..33d8353fa58dbc66fc9d22fcd510ded6b26ce719:/samples/html/widget/widget.cpp

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 705b1e39b3..1a05c51ee8 100644
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -1,14 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        widget.cpp
-// Purpose:     wxHtml testing example
-//              Demonstrates embedded controls
+// Name:        zip.cpp
+// Purpose:     wxHtml sample: Demonstrates embedded controls
+// Author:      ?
+// Modified by:
+// Created:     ?
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation "test.cpp"
-    #pragma interface "test.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -22,23 +22,17 @@
     #include "wx/wx.h"
 #endif
 
-
 #include "wx/html/htmlwin.h"
-
 #include "../../sample.xpm"
 
 
-/*
-
-
-TAG HANDER FOR 'MYBIND' TAG
-
 
-*/
+// ----------------------------------------------------------------------------
+// TAG HANDER FOR 'MYBIND' TAG
+// ----------------------------------------------------------------------------
 
 #include "wx/html/m_templ.h"
 
-
 TAG_HANDLER_BEGIN(MYBIND, "MYBIND")
 
 TAG_HANDLER_PROC(tag)
@@ -52,8 +46,15 @@ TAG_HANDLER_PROC(tag)
 
     if (tag.HasParam(wxT("FLOAT"))) fl = ax;
 
-    wnd = new wxTextCtrl(m_WParser->GetWindow(), wxID_ANY, tag.GetParam(wxT("NAME")),
-        wxPoint(0,0), wxSize(ax, ay), wxTE_MULTILINE);
+    wnd = new wxTextCtrl
+              (
+                m_WParser->GetWindowInterface()->GetHTMLWindow(),
+                wxID_ANY,
+                tag.GetParam(wxT("NAME")),
+                wxPoint(0,0),
+                wxSize(ax, ay),
+                wxTE_MULTILINE
+              );
 
     wnd->Show(true);
 
@@ -120,7 +121,7 @@ enum
     Minimal_Forward,
 
     // controls start here (the numbers are, of course, arbitrary)
-    Minimal_Text = 1000,
+    Minimal_Text = 1000
 };
 
 // ----------------------------------------------------------------------------
@@ -154,14 +155,15 @@ 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( _("wxHtmlWindow testing application"),
         wxDefaultPosition, wxSize(640, 480) );
 
-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // Show it
     frame->Show(true);
-    SetTopWindow(frame);
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
@@ -177,8 +179,10 @@ wxHtmlWindow *html;
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
+    : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
 {
+    SetIcon(wxICON(sample));
+
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
     wxMenu *menuNav = new wxMenu;
@@ -196,7 +200,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetMenuBar(menuBar);
 
     SetIcon(wxIcon(sample_xpm));
-    
+
 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR