wxColour -> NSColor conversion.

[wxWidgets.git] / include / wx / rearrangectrl.h

diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h
index eb52fd96e42997da8cae3642e8f72d53c04b3772..de7fbb394c7945fcce470df6a94ffcbed5731a12 100644 (file)
--- a/include/wx/rearrangectrl.h
+++ b/include/wx/rearrangectrl.h
@@ -12,6 +12,9 @@
 #define _WX_REARRANGECTRL_H_
 
 #include "wx/checklst.h"
 #define _WX_REARRANGECTRL_H_
 
 #include "wx/checklst.h"

+
+#if wxUSE_REARRANGECTRL
+

 #include "wx/panel.h"
 #include "wx/dialog.h"
 
 #include "wx/panel.h"
 #include "wx/dialog.h"
 


@@ -106,7 +109,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
 
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxRearrangeList)
+    wxDECLARE_NO_COPY_CLASS(wxRearrangeList);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -163,7 +166,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
 
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxRearrangeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxRearrangeCtrl);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -173,6 +176,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,17 +187,47 @@ 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);
+
+
+    // methods for the dialog customization
+
+    // add extra contents to the dialog below the wxRearrangeCtrl part: the
+    // given window (usually a wxPanel containing more control inside it) must
+    // have the dialog as its parent and will be inserted into it at the right
+    // place by this method
+    void AddExtraControls(wxWindow *win);
+
+    // return the wxRearrangeList control used by the dialog
+    wxRearrangeList *GetList() const;
+

 
     // get the order of items after it was modified by the user
 
     // get the order of items after it was modified by the user

-    wxArrayInt GetOrder() const
-        { return m_ctrl->GetList()->GetCurrentOrder(); }
+    wxArrayInt GetOrder() const;

 
 private:
 
 private:

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

     wxRearrangeCtrl *m_ctrl;
 
     wxRearrangeCtrl *m_ctrl;
 

-    DECLARE_NO_COPY_CLASS(wxRearrangeDialog)
+    wxDECLARE_NO_COPY_CLASS(wxRearrangeDialog);

 };
 
 };
 

+#endif // wxUSE_REARRANGECTRL
+

 #endif // _WX_REARRANGECTRL_H_
 
 #endif // _WX_REARRANGECTRL_H_