wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

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

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index f176eaa893b74c3cc8ef7db2479857f43193e660..452a074c2c593b459004261727cabb692324a2e7 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -16,7 +16,8 @@
 #pragma interface "helpbest.h"
 #endif
 
 #pragma interface "helpbest.h"
 #endif
 

-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+    && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)

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


@@ -33,6 +34,7 @@ public:
 
     // 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);

+    virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }

 
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString)
 
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString)


@@ -71,7 +73,7 @@ public:
     }
 
     virtual bool KeywordSearch(const wxString& k,
     }
 
     virtual bool KeywordSearch(const wxString& k,

-                               wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
+                               wxHelpSearchMode mode = wxHELP_SEARCH_ALL)

     {
         return m_helpController->KeywordSearch( k, mode );
     }
     {
         return m_helpController->KeywordSearch( k, mode );
     }


@@ -85,7 +87,7 @@ public:
     virtual void SetFrameParameters(const wxString& title,
                                     const wxSize& size,
                                     const wxPoint& pos = wxDefaultPosition,
     virtual void SetFrameParameters(const wxString& title,
                                     const wxSize& size,
                                     const wxPoint& pos = wxDefaultPosition,

-                                    bool newFrameEachTime = FALSE)
+                                    bool newFrameEachTime = false)

     {
         m_helpController->SetFrameParameters( title, size, pos,
                                               newFrameEachTime );
     {
         m_helpController->SetFrameParameters( title, size, pos,
                                               newFrameEachTime );