Ryan's cumulative wxActiveX and media control patch (1427775)

[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 3dad7eda64d15f0c86f27d647ee692a043b7e884..e41e27cf1f5f3f64149df64b30b528c1ddd46a5f 100644 (file)
--- a/include/wx/msw/wince/helpwce.h
+++ b/include/wx/msw/wince/helpwce.h
@@ -19,7 +19,7 @@
 class WXDLLEXPORT wxWinceHelpController : public wxHelpControllerBase
 {
 public:
 class WXDLLEXPORT wxWinceHelpController : public wxHelpControllerBase
 {
 public:

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

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


@@ -47,10 +47,6 @@ protected:
     bool ViewURL(const wxString& topic = wxEmptyString);
 
 private:
     bool ViewURL(const wxString& topic = wxEmptyString);
 
 private:

-    // eVC4 needs default constructor, otherwise error C2512
-    // but make it hidden
-    wxWinceHelpController(): wxHelpControllerBase(NULL) {}
-

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