temporary fix the linking problem due to making GSocket::Detected_Read/Write() non...

[wxWidgets.git] / include / wx / html / helpdlg.h

diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h
index 7f9f1545979df28089b1ae01fdf45ba9acd1b49e..bca72de3ce6c77ca22426fa5b02600f421228185 100644 (file)
--- a/include/wx/html/helpdlg.h
+++ b/include/wx/html/helpdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpdlg.h
+// Name:        wx/html/helpdlg.h
 // Purpose:     wxHtmlHelpDialog
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
@@ -12,16 +12,13 @@
 #ifndef _WX_HELPDLG_H_
 #define _WX_HELPDLG_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "helpdlgex.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_WXHTML_HELP
 
 #include "wx/html/helpdata.h"
 #include "wx/window.h"
+#include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/config.h"
 #include "wx/splitter.h"
@@ -32,11 +29,11 @@
 #include "wx/checkbox.h"
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
-#include "wx/html/helpwin.h"
+#include "wx/html/helpwnd.h"
 #include "wx/html/htmprint.h"
 
-class WXDLLIMPEXP_HTML wxHtmlHelpController;
-class WXDLLIMPEXP_HTML wxHtmlHelpWindow;
+class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController;
+class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
 
 class WXDLLIMPEXP_HTML wxHtmlHelpDialog : public wxDialog
 {
@@ -47,7 +44,7 @@ public:
     wxHtmlHelpDialog(wxWindow* parent, wxWindowID wxWindowID,
                     const wxString& title = wxEmptyString,
                     int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL);
-    ~wxHtmlHelpDialog();
+    virtual ~wxHtmlHelpDialog();
 
     bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString,
                 int style = wxHF_DEFAULT_STYLE);
@@ -69,7 +66,7 @@ public:
     void SetTitleFormat(const wxString& format);
 
     // Override to add custom buttons to the toolbar
-    virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {};
+    virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}
 
 protected:
     void Init(wxHtmlHelpData* data = NULL);
@@ -91,4 +88,3 @@ protected:
     // wxUSE_WXHTML_HELP
 
 #endif
-