No changes, just implement Raise() in wxTopLevelWindow in wxMSW.

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

diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h
index b63540b3bffef92b317a4f5b8e7d9110b9b3d21e..dd51284d23d89e4c1e6467d389b8ff5d18e1af7e 100644 (file)
--- a/include/wx/html/helpdlg.h
+++ b/include/wx/html/helpdlg.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Author:      Harm van der Heijden, Vaclav Slavik, Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden, Vaclav Slavik, Julian Smart
 // Purpose:     wxHtmlHelpDialog
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden, Vaclav Slavik, Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden, Vaclav Slavik, Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPDLG_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPDLG_H_


@@ -18,6 +18,7 @@
 
 #include "wx/html/helpdata.h"
 #include "wx/window.h"
 
 #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"
 #include "wx/frame.h"
 #include "wx/config.h"
 #include "wx/splitter.h"


@@ -31,8 +32,8 @@
 #include "wx/html/helpwnd.h"
 #include "wx/html/htmprint.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
 {
 
 class WXDLLIMPEXP_HTML wxHtmlHelpDialog : public wxDialog
 {


@@ -43,7 +44,7 @@ public:
     wxHtmlHelpDialog(wxWindow* parent, wxWindowID wxWindowID,
                     const wxString& title = wxEmptyString,
                     int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL);
     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);
 
     bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString,
                 int style = wxHF_DEFAULT_STYLE);


@@ -65,7 +66,7 @@ public:
     void SetTitleFormat(const wxString& format);
 
     // Override to add custom buttons to the toolbar
     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);
 
 protected:
     void Init(wxHtmlHelpData* data = NULL);


@@ -80,11 +81,10 @@ protected:
     wxHtmlHelpController* m_helpController;
 
     DECLARE_EVENT_TABLE()
     wxHtmlHelpController* m_helpController;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxHtmlHelpDialog)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog);

 };
 
 #endif
     // wxUSE_WXHTML_HELP
 
 #endif
 };
 
 #endif
     // wxUSE_WXHTML_HELP
 
 #endif

-