Removed redundant wx<Control>NameStr declarations.

[wxWidgets.git] / include / wx / msw / helpchm.h

diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index 4a172009be9a464ed4aaeb1aa3e0933a7b882772..776902520c491dd5aad89001b6e163dfc518172a 100644 (file)
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -16,23 +16,19 @@
 #pragma interface "helpchm.h"
 #endif
 
 #pragma interface "helpchm.h"
 #endif
 

-#include "wx/wx.h"
-
-#if wxUSE_HELP
+#if wxUSE_MS_HTML_HELP

 
 #include "wx/helpbase.h"
 
 
 #include "wx/helpbase.h"
 

-class WXDLLEXPORT wxCHMHelpController: public wxHelpControllerBase
+class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase

 {
 {

-    DECLARE_CLASS(wxCHMHelpController)
-        

 public:
 public:

-    wxCHMHelpController() {}
-    ~wxCHMHelpController() {}
-    
+    wxCHMHelpController() { }
+    virtual ~wxCHMHelpController();
+

     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);

-    
+

     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString);
     virtual bool DisplayContents();
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString);
     virtual bool DisplayContents();


@@ -44,16 +40,19 @@ public:
     virtual bool KeywordSearch(const wxString& k);
     virtual bool Quit();
 
     virtual bool KeywordSearch(const wxString& k);
     virtual bool Quit();
 

-    inline wxString GetHelpFile() const { return m_helpFile; }
-    
+    wxString GetHelpFile() const { return m_helpFile; }
+

 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;

-    
+

 protected:
     wxString m_helpFile;
 protected:
     wxString m_helpFile;

+
+    DECLARE_CLASS(wxCHMHelpController)

 };
 
 };
 

-#endif // wxUSE_HELP
+#endif // wxUSE_MS_HTML_HELP
+

 #endif
 // _WX_HELPCHM_H_
 #endif
 // _WX_HELPCHM_H_