Default to wxConvUTF8 (not wxConvAuto) in wxDataInputStream and wxDataOutputStream...

[wxWidgets.git] / interface / wx / propdlg.h

diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h
index 77cd2f43edae56e01ac81b7378c6058a06550559..07af2d11eaeb91c6950c3419bc5cf6d1f01a00b5 100644 (file)
--- a/interface/wx/propdlg.h
+++ b/interface/wx/propdlg.h
@@ -58,7 +58,6 @@ enum wxPropertySheetDialogFlags
 
 /**
     @class wxPropertySheetDialog
-    @wxheader{propdlg.h}
 
     This class represents a property sheet dialog: a tabbed dialog
     for showing settings. It is optimized to show flat tabs
@@ -75,7 +74,7 @@ enum wxPropertySheetDialogFlags
     bool MyPropertySheetDialog::Create(...)
     {
         if (!wxPropertySheetDialog::Create(...))
-            return @false;
+            return false;
 
         CreateButtons(wxOK|wxCANCEL|wxHELP);
 
@@ -84,7 +83,7 @@ enum wxPropertySheetDialogFlags
         GetBookCtrl()->AddPage(panel, wxT("General"));
 
         LayoutDialog();
-        return @true;
+        return true;
     }
     @endcode
 
@@ -117,7 +116,7 @@ public:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = wxDEFAULT_DIALOG_STYLE,
-                          const wxString& name = "dialogBox");
+                          const wxString& name = wxDialogNameStr);
 
     /**
         Override this if you wish to add the book control in a way different from the
@@ -128,12 +127,11 @@ public:
     /**
         Call this from your own Create function, before adding buttons and pages.
     */
-    bool Create(wxWindow* parent, wxWindowID id,
-                const wxString& title,
+    bool Create(wxWindow* parent, wxWindowID id, const wxString& title,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,
-                const wxString& name = "dialogBox");
+                const wxString& name = wxDialogNameStr);
 
     /**
         Override this if you wish to create a different kind of book control; by
@@ -150,7 +148,7 @@ public:
 
         @note On PocketPC, no buttons are created.
     */
-    void CreateButtons(int flags = wxOK|wxCANCEL);
+    virtual void CreateButtons(int flags = wxOK|wxCANCEL);
 
     /**
         Returns the book control that will contain your settings pages.
@@ -175,7 +173,7 @@ public:
         @note On PocketPC, this does nothing, since the dialog will be shown full-screen,
               and the layout will be done when the dialog receives a size event.
     */
-    void LayoutDialog(int centreFlags = wxBOTH);
+    virtual void LayoutDialog(int centreFlags = wxBOTH);
 
     /**
         Sets the book control used for the dialog.