X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6bfc18d01649c47eb2157f1333d8c189be83ee4d..36a0190ebd5bd9a7302f60f6dcd608b80574e21c:/interface/wx/propdlg.h?ds=sidebyside diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h index b2a45243c1..dd953cce0d 100644 --- a/interface/wx/propdlg.h +++ b/interface/wx/propdlg.h @@ -2,8 +2,7 @@ // Name: propdlg.h // Purpose: interface of wxPropertySheetDialog // Author: wxWidgets team -// RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -80,7 +79,7 @@ enum wxPropertySheetDialogFlags // Add page wxPanel* panel = new wxPanel(GetBookCtrl(), ...); - GetBookCtrl()->AddPage(panel, wxT("General")); + GetBookCtrl()->AddPage(panel, "General"); LayoutDialog(); return true; @@ -116,7 +115,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 @@ -127,12 +126,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 @@ -149,7 +147,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. @@ -174,7 +172,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. @@ -183,13 +181,6 @@ public: */ void SetBookCtrl(wxBookCtrlBase* bookCtrl); - /** - Sets the inner sizer that contains the book control and button sizer. - - You will normally not need to use this. - */ - void SetInnerSizer(wxSizer* sizer); - /** You can customize the look and feel of the dialog by setting the sheet style. It is a bit list of the ::wxPropertySheetDialogFlags values.