wxStdButtonSizer Finalise --> Realize

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/stdbtnsz.tex b/docs/latex/wx/stdbtnsz.tex
index 256d08f6a8ac008e6638b182dd1c114b2f3b957a..065acd3485b97e29ffc1b1c9081bd0827c779dc1 100644 (file)
--- a/docs/latex/wx/stdbtnsz.tex
+++ b/docs/latex/wx/stdbtnsz.tex
@@ -9,7 +9,7 @@ When there aren't interface guidelines defined for a particular platform or tool
 to the Windows implementation. 
 
 To use this class, first add buttons to the sizer by calling AddButton (or SetAffirmativeButton, SetNegativeButton,
-or SetCancelButton) and then call Finalise in order to create the actual button layout used. Other than these special
+or SetCancelButton) and then call Realize in order to create the actual button layout used. Other than these special
 operations, this sizer works like any other sizer. 
 
 If you add a button with wxID\_SAVE, on Mac OS X the button will be renamed to "Save" and
@@ -52,9 +52,9 @@ Adds a button to the wxStdDialogButtonSizer. The button must have one of the fol
 \item wxID\_CONTEXT\_HELP
 \end{itemize}
 
-\membersection{wxStdDialogButtonSizer::Finalise}\label{wxstddialogbuttonsizerfinalise}
+\membersection{wxStdDialogButtonSizer::Realize}\label{wxstddialogbuttonsizerrealize}
 
-\func{void}{Finalise}{\void}
+\func{void}{Realize}{\void}
 
 Rearranges the buttons and applies proper spacing between buttons to make them match the platform or toolkit's interface guidelines.
 

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index c38c47a0ef7932a565acbc9bff4813b0af94857f..c245371191ac01e95401d51980674258b2c2298c 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -669,7 +669,7 @@ public:
     // is set to _("Save") and m_buttonNegative is set to _("Don't Save")
     // I wouldn't add any other hacks like that into here,
     // but this one I can see being useful.
-    void Finalise();
+    void Realize();
 
     wxButton *GetAffirmativeButton() const { return m_buttonAffirmative; }
     wxButton *GetApplyButton() const { return m_buttonApply; }

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 9cc91601f799fa23393f97a7b8086562dfa27ce8..9874f0f54770ef69af179f0ce78c8035fbaa4622 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -595,7 +595,7 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
     wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer;
     sizerBtns->AddButton(new wxButton(this, wxID_OK));
     sizerBtns->AddButton(new wxButton(this, wxID_CANCEL));
-    sizerBtns->Finalise();
+    sizerBtns->Realize();
 
     wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL);
     sizerText->Add(new wxStaticText(this, wxID_ANY, _T("Date in ISO format: ")),

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index f810b795a413196af0015f7de55a079f2d996003..ca535d37d294ac90993c7dee404eb23f16228b33 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -205,7 +205,7 @@ wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
         sizer->AddButton(help);
     }
 
-    sizer->Finalise();
+    sizer->Realize();
 
     if (flags & wxNO_DEFAULT)
     {

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 60f03929c5a8392218329c6e179755e806f97200..f787a74ffc5e83e447c1da6726e1f408c87a522b 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -1728,7 +1728,7 @@ void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
     m_buttonCancel = button;
 }
 
-void wxStdDialogButtonSizer::Finalise()
+void wxStdDialogButtonSizer::Realize()
 {
 #ifdef __WXMAC__
         Add(0, 0, 0, wxLEFT, 6);

diff --git a/wxPython/demo/Validator.py b/wxPython/demo/Validator.py
index 688712c01567ba1d0187bd7e19bbf8ba8dcb99dd..31dd044967e0243b81aaf10bd6d126db150fe8d1 100644 (file)
--- a/wxPython/demo/Validator.py
+++ b/wxPython/demo/Validator.py
@@ -193,7 +193,7 @@ class TestValidateDialog(wx.Dialog):
         b.SetDefault()
         buttons.AddButton(b)
         buttons.AddButton(wx.Button(self, wx.ID_CANCEL, "Cancel"))
-        buttons.Finalise()
+        buttons.Realize()
 
         border = wx.BoxSizer(wx.VERTICAL)
         border.Add(fgs, 1, wx.GROW|wx.ALL, 25)

diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i
index e34ed95a19c0c474065e09e8e7c61e9e01c62e79..8fe5f1b071a26fb82c27ad5778f061b8af2c8075 100644 (file)
--- a/wxPython/src/_sizers.i
+++ b/wxPython/src/_sizers.i
@@ -1270,7 +1270,7 @@ DocStr(wxStdDialogButtonSizer,
 "A special sizer that knows how to order and position standard buttons
 in order to conform to the current platform's standards.  You simply
 need to add each `wx.Button` to the sizer, and be sure to create the
-buttons using the standard ID's.  Then call `Finalize` and the sizer
+buttons using the standard ID's.  Then call `Realize` and the sizer
 will take care of the rest.
 ", "");
 
@@ -1287,7 +1287,7 @@ public:
 method in the base class.", "");
     
     DocDeclStr(
-        void , Finalise(),
+        void , Realize(),
         "This funciton needs to be called after all the buttons have been added
 to the sizer.  It will reorder them and position them in a platform
 specifc manner.", "");

diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index fa5c4614352fcf52457c4e91c95a8c8a9a5c2dd4..395d36dde8c4e7ff2e1b20b24d7f2e0e024bcdd9 100644 (file)
--- a/wxPython/wx/lib/dialogs.py
+++ b/wxPython/wx/lib/dialogs.py
@@ -77,7 +77,7 @@ class MultipleChoiceDialog(wx.Dialog):
         btnsizer = wx.StdDialogButtonSizer()
         btnsizer.AddButton(ok)
         btnsizer.AddButton(cancel)
-        btnsizer.Finalise()
+        btnsizer.Realize()
         
         dlgsizer.Add(btnsizer, 0, wx.ALL | wx.ALIGN_RIGHT, 4)