Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h
index 16af1ecf9286d35965e6d4b10fb04f0922f7961e..dd51284d23d89e4c1e6467d389b8ff5d18e1af7e 100644 (file)
--- a/include/wx/html/helpdlg.h
+++ b/include/wx/html/helpdlg.h
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden, Vaclav Slavik, Julian Smart
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden, Vaclav Slavik, Julian Smart
 // 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_


@@ -32,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
 {


@@ -44,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);


@@ -66,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);


@@ -81,7 +81,7 @@ protected:
     wxHtmlHelpController* m_helpController;
 
     DECLARE_EVENT_TABLE()
     wxHtmlHelpController* m_helpController;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxHtmlHelpDialog)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog);

 };
 
 #endif
 };
 
 #endif