added default ctor and Create() to wxRearrangeDialog for consistency

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

diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h
index eb52fd96e42997da8cae3642e8f72d53c04b3772..da1b0c1d69fed0d106600cb575655944992edc32 100644 (file)
--- a/include/wx/rearrangectrl.h
+++ b/include/wx/rearrangectrl.h
@@ -173,6 +173,9 @@ private:
 class WXDLLIMPEXP_CORE wxRearrangeDialog : public wxDialog
 {
 public:
 class WXDLLIMPEXP_CORE wxRearrangeDialog : public wxDialog
 {
 public:

+    // default ctor, use Create() later
+    wxRearrangeDialog() { Init(); }
+

     // ctor for the dialog: message is shown inside the dialog itself, order
     // and items are passed to wxRearrangeList used internally
     wxRearrangeDialog(wxWindow *parent,
     // ctor for the dialog: message is shown inside the dialog itself, order
     // and items are passed to wxRearrangeList used internally
     wxRearrangeDialog(wxWindow *parent,


@@ -181,13 +184,29 @@ public:
                       const wxArrayInt& order,
                       const wxArrayString& items,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxArrayInt& order,
                       const wxArrayString& items,
                       const wxPoint& pos = wxDefaultPosition,

-                      const wxString& name = wxRearrangeDialogNameStr);
+                      const wxString& name = wxRearrangeDialogNameStr)
+    {
+        Init();
+
+        Create(parent, message, title, order, items, pos, name);
+    }
+
+    bool Create(wxWindow *parent,
+                const wxString& message,
+                const wxString& title,
+                const wxArrayInt& order,
+                const wxArrayString& items,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxString& name = wxRearrangeDialogNameStr);

 
     // get the order of items after it was modified by the user
     wxArrayInt GetOrder() const
         { return m_ctrl->GetList()->GetCurrentOrder(); }
 
 private:
 
     // get the order of items after it was modified by the user
     wxArrayInt GetOrder() const
         { return m_ctrl->GetList()->GetCurrentOrder(); }
 
 private:

+    // common part of all ctors
+    void Init() { m_ctrl = NULL; }
+

     wxRearrangeCtrl *m_ctrl;
 
     DECLARE_NO_COPY_CLASS(wxRearrangeDialog)
     wxRearrangeCtrl *m_ctrl;
 
     DECLARE_NO_COPY_CLASS(wxRearrangeDialog)

diff --git a/interface/wx/rearrangectrl.h b/interface/wx/rearrangectrl.h
index 721fe1c15eb5cec96215ae40f522bf91ea07b113..9160b3efa7426da6e8dc1b09882702497ebbc708 100644 (file)
--- a/interface/wx/rearrangectrl.h
+++ b/interface/wx/rearrangectrl.h
@@ -266,9 +266,30 @@ public:
 class wxRearrangeDialog
 {
 public:
 class wxRearrangeDialog
 {
 public:

+    /**
+        Default constructor.
+
+        Create() must be called later to effectively create the control.
+     */
+    wxRearrangeDialog();
+

     /**
         Constructor creating the dialog.
 
     /**
         Constructor creating the dialog.
 

+        Please see Create() for the parameters description.
+     */
+    wxRearrangeDialog(wxWindow *parent,
+                      const wxString& message,
+                      const wxString& title,
+                      const wxArrayInt& order,
+                      const wxArrayString& items,
+                      const wxPoint& pos = wxDefaultPosition,
+                      const wxString& name = wxRearrangeDialogNameStr);
+
+    /**
+        Effectively creates the dialog for an object created using the default
+        constructor. 
+

         @param parent
             The dialog parent, possibly @NULL.
         @param message
         @param parent
             The dialog parent, possibly @NULL.
         @param message


@@ -284,14 +305,17 @@ public:
             Optional dialog position.
         @param name
             Optional dialog name.
             Optional dialog position.
         @param name
             Optional dialog name.

+        @return
+            @true if the dialog was successfully created or @false if creation
+            failed.

      */
      */

-    wxRearrangeDialog(wxWindow *parent,
-                      const wxString& message,
-                      const wxString& title,
-                      const wxArrayInt& order,
-                      const wxArrayString& items,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxString& name = wxRearrangeDialogNameStr);
+    bool Create(wxWindow *parent,
+                const wxString& message,
+                const wxString& title,
+                const wxArrayInt& order,
+                const wxArrayString& items,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxString& name = wxRearrangeDialogNameStr);

 
     /**
         Return the array describing the order of items after it was modified by
 
     /**
         Return the array describing the order of items after it was modified by