Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/rearrangectrl.h b/include/wx/rearrangectrl.h
index da1b0c1d69fed0d106600cb575655944992edc32..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);

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


@@ -199,9 +202,21 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxString& name = wxRearrangeDialogNameStr);
 
                 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:
     // common part of all ctors
 
 private:
     // common part of all ctors


@@ -209,8 +224,10 @@ private:
 
     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_