Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index 3d2e609b7dc2de11d4101496ff2250a7c6f275c7..5af4f824e0beeefdc6ec3bb39460cade2a47c8e8 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -12,23 +12,19 @@
 #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/helpbase.h"
 
 #include "wx/wx.h"
 
 #if wxUSE_HELP
 
 #include "wx/helpbase.h"
 

-class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
+class WXDLLIMPEXP_CORE 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);