Move code removing "-psn_xxx" command line arguments to common code.

[wxWidgets.git] / interface / wx / html / helpdlg.h

diff --git a/interface/wx/html/helpdlg.h b/interface/wx/html/helpdlg.h
index 6f7b824ca59a12f9955c05f671d75b7b19d722f2..a42dbd098138cb9600c3f8a3c514ec803632ccf1 100644 (file)
--- a/interface/wx/html/helpdlg.h
+++ b/interface/wx/html/helpdlg.h
@@ -2,8 +2,7 @@
 // Name:        html/helpdlg.h
 // Purpose:     interface of wxHtmlHelpDialog
 // Author:      wxWidgets team
 // Name:        html/helpdlg.h
 // Purpose:     interface of wxHtmlHelpDialog
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -16,7 +15,7 @@
     @library{wxhtml}
     @category{help,html}
 */
     @library{wxhtml}
     @category{help,html}
 */

-class wxHtmlHelpDialog : public wxFrame
+class wxHtmlHelpDialog : public wxDialog

 {
 public:
     wxHtmlHelpDialog(wxHtmlHelpData* data = NULL);
 {
 public:
     wxHtmlHelpDialog(wxHtmlHelpData* data = NULL);


@@ -26,7 +25,7 @@ public:
 
         For the possible values of @a style, please see wxHtmlHelpController.
     */
 
         For the possible values of @a style, please see wxHtmlHelpController.
     */

-    wxHtmlHelpDialog(wxWindow* parent, int wxWindowID,
+    wxHtmlHelpDialog(wxWindow* parent, wxWindowID id,

                      const wxString& title = wxEmptyString,
                      int style = wxHF_DEFAULT_STYLE,
                      wxHtmlHelpData* data = NULL);
                      const wxString& title = wxEmptyString,
                      int style = wxHF_DEFAULT_STYLE,
                      wxHtmlHelpData* data = NULL);


@@ -53,18 +52,10 @@ public:
     */
     wxHtmlHelpController* GetController() const;
 
     */
     wxHtmlHelpController* GetController() const;
 

-    /**
-        Reads the user's settings for this dialog
-
-        @see wxHtmlHelpController::ReadCustomization
-    */
-    void ReadCustomization(wxConfigBase* cfg,
-                           const wxString& path = wxEmptyString);
-

     /**
         Sets the help controller associated with the dialog.
     */
     /**
         Sets the help controller associated with the dialog.
     */

-    void SetController(wxHtmlHelpController* contoller);
+    void SetController(wxHtmlHelpController* controller);

 
     /**
         Sets the dialog's title format.
 
     /**
         Sets the dialog's title format.


@@ -72,13 +63,5 @@ public:
         @a format must contain exactly one "%s" (it will be replaced by the page title).
     */
     void SetTitleFormat(const wxString& format);
         @a format must contain exactly one "%s" (it will be replaced by the page title).
     */
     void SetTitleFormat(const wxString& format);

-
-    /**
-        Saves the user's settings for this dialog
-
-        @see wxHtmlHelpController::WriteCustomization
-    */
-    void WriteCustomization(wxConfigBase* cfg,
-                            const wxString& path = wxEmptyString);

 };
 
 };