add an assert indicating that old code overriding OnExecute() must be updated with 2.9

[wxWidgets.git] / include / wx / msw / wince / helpwce.h

diff --git a/include/wx/msw/wince/helpwce.h b/include/wx/msw/wince/helpwce.h
index 463772e9b05babe30221b746afcb09a186b51327..9923e515c09eed60d618bb598c737056eda48bc3 100644 (file)
--- a/include/wx/msw/wince/helpwce.h
+++ b/include/wx/msw/wince/helpwce.h
@@ -1,29 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpwce.h
+// Name:        wx/msw/wince/helpwce.h

 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWCE_H_
 #define _WX_HELPWCE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWCE_H_
 #define _WX_HELPWCE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpwce.cpp"
-#endif
-

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

-class WXDLLEXPORT wxWinceHelpController : public wxHelpControllerBase
+class WXDLLIMPEXP_CORE wxWinceHelpController : public wxHelpControllerBase

 {
 public:
 {
 public:

-    wxWinceHelpController() {}
+    wxWinceHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}

     virtual ~wxWinceHelpController() {}
 
     // Must call this to set the filename
     virtual ~wxWinceHelpController() {}
 
     // Must call this to set the filename


@@ -50,7 +46,7 @@ protected:
     // View topic, or just the HTML file
     bool ViewURL(const wxString& topic = wxEmptyString);
 
     // View topic, or just the HTML file
     bool ViewURL(const wxString& topic = wxEmptyString);
 

-protected:
+private:

     wxString m_helpFile;
 
     DECLARE_CLASS(wxWinceHelpController)
     wxString m_helpFile;
 
     DECLARE_CLASS(wxWinceHelpController)


@@ -60,4 +56,3 @@ protected:
 
 #endif
 // _WX_HELPWCE_H_
 
 #endif
 // _WX_HELPWCE_H_

-