added new wxHF_ flags

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index f67150b423ba66dc60bef7b66352c3fbb81a8990..b437a9b3e0a1c0e8c577e70bec4f44c1f2ecf6c1 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -58,7 +58,6 @@
       void OnClose(wxCloseEvent& event);
    private:
       wxHtmlHelpController help;
-      wxConfig* config;
    
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
@@ -106,12 +105,10 @@
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {
-       #if wxUSE_LIBPNG
-        wxImage::AddHandler(new wxPNGHandler);
-       #endif
-       #if wxUSE_LIBJPEG
-        wxImage::AddHandler(new wxJPEGHandler);
-       #endif
+      wxInitAllImageHandlers();
+
+      SetVendorName("wxWindows");
+      SetAppName("wxHTMLHelp"); 
 
     // Create the main application window
       MyFrame *frame = new MyFrame("HTML Help Sample",
@@ -151,10 +148,9 @@
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
 
-      config = new wxConfig("wxHTMLhelp");
-
-      help.UseConfig(config);
+      help.UseConfig(wxConfig::Get());
       bool ret;
+      help.SetTempDir(".");
       ret = help.AddBook("helpfiles/testing.hhp");
       if (! ret)
          wxMessageBox("Failed adding book helpfiles/testing.hhp");
@@ -184,8 +180,8 @@
        if ( help.GetFrame() ) // returns NULL if no help frame active
            help.GetFrame()->Close(TRUE);
        // now we can safely delete the config pointer
-       delete config;
        event.Skip();   
+       delete wxConfig::Set(NULL);
    }