deprecate SetLabel(const wxBitmap&)

[wxWidgets.git] / include / wx / html / helpctrl.h

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 06e6bdc7ee8dee4e219f8cce28e8118856914213..a82c411e5329929bac61ead4242d99de81c58b94 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -14,10 +14,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpctrl.h"
-#endif
-

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


@@ -30,13 +26,13 @@ class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxE
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
 
 public:

-    wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE);
+    wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE, wxWindow* parentWindow = NULL);

     virtual ~wxHtmlHelpController();
 
     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }
     virtual ~wxHtmlHelpController();
 
     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }

-    bool AddBook(const wxString& book_url, bool show_wait_msg = FALSE);
-    bool AddBook(const wxFileName& book_file, bool show_wait_msg = FALSE);
+    bool AddBook(const wxString& book_url, bool show_wait_msg = false);
+    bool AddBook(const wxFileName& book_file, bool show_wait_msg = false);

 
     bool Display(const wxString& x);
     bool Display(int id);
 
     bool Display(const wxString& x);
     bool Display(int id);


@@ -68,7 +64,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);

     /// Obtains the latest settings used by the help frame and the help
     /// frame.
     virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
     /// Obtains the latest settings used by the help frame and the help
     /// frame.
     virtual wxFrame *GetFrameParameters(wxSize *size = NULL,


@@ -79,7 +75,7 @@ public:
     wxHtmlHelpData *GetHelpData() { return &m_helpData; }
 
     virtual bool Quit() ;
     wxHtmlHelpData *GetHelpData() { return &m_helpData; }
 
     virtual bool Quit() ;

-    virtual void OnQuit() {};
+    virtual void OnQuit() {}

 
     void OnCloseFrame(wxCloseEvent& evt);
 
 
     void OnCloseFrame(wxCloseEvent& evt);