undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h
index b2a45243c1ab2b2515cc9988c367eb443268a5d9..9b7c9bbe05b458584bbb5b12fb85ac30da2ceca6 100644 (file)
--- a/interface/wx/propdlg.h
+++ b/interface/wx/propdlg.h
@@ -80,7 +80,7 @@ enum wxPropertySheetDialogFlags
 
         // Add page
         wxPanel* panel = new wxPanel(GetBookCtrl(), ...);
 
         // Add page
         wxPanel* panel = new wxPanel(GetBookCtrl(), ...);

-        GetBookCtrl()->AddPage(panel, wxT("General"));
+        GetBookCtrl()->AddPage(panel, "General");

 
         LayoutDialog();
         return true;
 
         LayoutDialog();
         return true;


@@ -116,7 +116,7 @@ public:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = wxDEFAULT_DIALOG_STYLE,
                           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
 
     /**
         Override this if you wish to add the book control in a way different from the


@@ -127,12 +127,11 @@ public:
     /**
         Call this from your own Create function, before adding buttons and pages.
     */
     /**
         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 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
 
     /**
         Override this if you wish to create a different kind of book control; by


@@ -149,7 +148,7 @@ public:
 
         @note On PocketPC, no buttons are created.
     */
 
         @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.
 
     /**
         Returns the book control that will contain your settings pages.


@@ -174,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.
     */
         @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.
 
     /**
         Sets the book control used for the dialog.