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 dfcfcde0180d53b5b71cfe2dd2169a9d72ce3f5b..24321b416675aab8cd2f90753a754fbfea6a07d7 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -12,10 +12,6 @@
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
 #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
 #include "wx/wx.h"
 
 #if wxUSE_HELP


@@ -27,8 +23,8 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
     DECLARE_CLASS(wxWinHelpController)
 
 public:
     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);
 
     // Must call this to set the filename
     virtual bool Initialize(const wxString& file);