X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..5eeccdd52c8a7140bfa220d412aa9dc181f7a4d8:/interface/wx/propdlg.h?ds=sidebyside diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h index 80589541a8..a55804eaea 100644 --- a/interface/wx/propdlg.h +++ b/interface/wx/propdlg.h @@ -3,7 +3,7 @@ // Purpose: interface of wxPropertySheetDialog // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -74,16 +74,16 @@ enum wxPropertySheetDialogFlags bool MyPropertySheetDialog::Create(...) { if (!wxPropertySheetDialog::Create(...)) - return @false; + return false; CreateButtons(wxOK|wxCANCEL|wxHELP); // Add page wxPanel* panel = new wxPanel(GetBookCtrl(), ...); - GetBookCtrl()->AddPage(panel, wxT("General")); + GetBookCtrl()->AddPage(panel, "General"); LayoutDialog(); - return @true; + return true; } @endcode @@ -116,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 @@ -127,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 @@ -149,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. @@ -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. */ - void LayoutDialog(int centreFlags = wxBOTH); + virtual void LayoutDialog(int centreFlags = wxBOTH); /** Sets the book control used for the dialog. @@ -183,13 +182,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.