check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index cec79159d9958b0ed530b74d93f443efb075be82..24321b416675aab8cd2f90753a754fbfea6a07d7 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -6,16 +6,12 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpwin.h"
-#endif
-
 #include "wx/wx.h"
 
 #if wxUSE_HELP
@@ -25,10 +21,10 @@
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 {
     DECLARE_CLASS(wxWinHelpController)
-        
+
 public:
-    wxWinHelpController() {};
-    ~wxWinHelpController() {};
+    wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
+    virtual ~wxWinHelpController() {}
 
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);
@@ -50,7 +46,7 @@ public:
 protected:
     // Append extension if necessary.
     wxString GetValidFilename(const wxString& file) const;
-    
+
 private:
     wxString m_helpFile;
 };