removed 2nd frame from html test sample; test sample now shows DL,DT,DD support

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

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 574b40ad67d8e24b4c65871e8b53d5b2cde4418d..8268532c50689d0844b60c883df35d1e5e2c9f2b 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -109,29 +109,17 @@
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {
-     wxLogDebug("[starting testing app]");
-     #if wxUSE_LIBPNG
-     wxImage::AddHandler(new wxPNGHandler);
-     #endif
-     #if wxUSE_LIBJPEG
-     wxImage::AddHandler(new wxJPEGHandler);
-     #endif
-     #if wxUSE_GIF
-     wxImage::AddHandler(new wxGIFHandler);
-     #endif
+     wxInitAllImageHandlers();
      #if wxUSE_FS_INET
      wxFileSystem::AddHandler(new wxInternetFSHandler);
      #endif
     // Create the main application window
       MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
          wxPoint(50, 50), wxSize(640, 480));
-      MyFrame *frame2 = new MyFrame("wxHtmlWindow testing application, frame 2",
-         wxPoint(150, 50), wxSize(320, 240));
    
     // Show it and tell the application that it's our main window
     // @@@ what does it do exactly, in fact? is it necessary here?
       frame->Show(TRUE);
-      frame2->Show(TRUE);
       SetTopWindow(frame);
 
    

diff --git a/samples/html/test/test.htm b/samples/html/test/test.htm
index c056a114b09afaa01a20b4c5ea269ea1767255cf..acdd00a134981ba2f01f886abf00153bacd1bfa9 100644 (file)
--- a/samples/html/test/test.htm
+++ b/samples/html/test/test.htm
@@ -263,6 +263,27 @@ And link to BINARY : <a href="test">Unix</a> or <a href="test.exe">Windows</a>
 <BR>
 <a href="http://www.tue.nl">ANOTHER LINK(www.tue.nl)</a>
 
+<p><hr size=4><p>
+
+<h2>Definition lists</h2>
+
+This is definition list (DL,DT,DD):
+<dl>
+    <dt> term
+    <dd> and it's definition
+    
+    <dt> Windows 95
+    <dt> Windows 98
+    <dt> Windows NT
+    <dd> so-called operating systems
+    <dd> Micro$oft trademarks
+    
+    <dt> Unix
+    <dd> operating system
+    <dd> huh?
+
+</dl>
+...end of DD
 
 </BODY>
 </HTML>