Tried to make wxGLCanvas work again. WIP.

[wxWidgets.git] / src / html / helpctrl.cpp

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index d40ac14e76e3d982d49b283f6eca44f3cc9aad38..e25e606060682667c12284f03d574a5438409b54 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -1,17 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpctrl.cpp
 // Purpose:     wxHtmlHelpController
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpctrl.cpp
 // Purpose:     wxHtmlHelpController

-// Notes:       Based on htmlhelp.cpp, implementing a monolithic 
+// Notes:       Based on htmlhelp.cpp, implementing a monolithic

 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik

-// Created:
-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "helpctrl.h"
+#pragma implementation

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -29,6 +28,8 @@
 #include "wx/wx.h"
 #include "wx/busyinfo.h"
 
 #include "wx/wx.h"
 #include "wx/busyinfo.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxEvtHandler)
+

 BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
     EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
     EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
 END_EVENT_TABLE()


@@ -59,7 +60,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 {
     wxBusyCursor cur;
 #if wxUSE_BUSYINFO
 {
     wxBusyCursor cur;
 #if wxUSE_BUSYINFO

-    wxBusyInfo* busy;
+    wxBusyInfo* busy = NULL;

     wxString info;
     if (show_wait_msg) {
        info.Printf(_("Adding book %s"), book.c_str());
     wxString info;
     if (show_wait_msg) {
        info.Printf(_("Adding book %s"), book.c_str());