Fix keyboard navigation in wxGrid with reordered columns.

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

diff --git a/include/wx/editlbox.h b/include/wx/editlbox.h
index 6b90901bc9a5963e941438fbfe074178df49c143..7820e7276492fb276a4f188648a3c352bceadaa7 100644 (file)
--- a/include/wx/editlbox.h
+++ b/include/wx/editlbox.h
@@ -11,16 +11,23 @@
 #ifndef __WX_EDITLBOX_H__
 #define __WX_EDITLBOX_H__
 
 #ifndef __WX_EDITLBOX_H__
 #define __WX_EDITLBOX_H__
 

+#include "wx/defs.h"
+
+#if wxUSE_EDITABLELISTBOX
+

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

-class WXDLLEXPORT wxBitmapButton;
-class WXDLLEXPORT wxListCtrl;
-class WXDLLEXPORT wxListEvent;
+class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxListCtrl;
+class WXDLLIMPEXP_FWD_CORE wxListEvent;

 
 #define wxEL_ALLOW_NEW          0x0100
 #define wxEL_ALLOW_EDIT         0x0200
 #define wxEL_ALLOW_DELETE       0x0400
 #define wxEL_NO_REORDER         0x0800
 
 #define wxEL_ALLOW_NEW          0x0100
 #define wxEL_ALLOW_EDIT         0x0200
 #define wxEL_ALLOW_DELETE       0x0400
 #define wxEL_NO_REORDER         0x0800

+#define wxEL_DEFAULT_STYLE      (wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE)
+
+extern WXDLLIMPEXP_DATA_ADV(const char) wxEditableListBoxNameStr[];

 
 // This class provides a composite control that lets the
 // user easily enter list of strings
 
 // This class provides a composite control that lets the
 // user easily enter list of strings


@@ -28,12 +35,25 @@ class WXDLLEXPORT wxListEvent;
 class WXDLLIMPEXP_ADV wxEditableListBox : public wxPanel
 {
 public:
 class WXDLLIMPEXP_ADV wxEditableListBox : public wxPanel
 {
 public:

+    wxEditableListBox() { Init(); }
+

     wxEditableListBox(wxWindow *parent, wxWindowID id,
                       const wxString& label,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,
     wxEditableListBox(wxWindow *parent, wxWindowID id,
                       const wxString& label,
                       const wxPoint& pos = wxDefaultPosition,
                       const wxSize& size = wxDefaultSize,

-                      long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,
-                      const wxString& name = wxT("editableListBox"));
+                      long style = wxEL_DEFAULT_STYLE,
+                      const wxString& name = wxEditableListBoxNameStr)
+    {
+        Init();
+        Create(parent, id, label, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxEL_DEFAULT_STYLE,
+                const wxString& name = wxEditableListBoxNameStr);

 
     void SetStrings(const wxArrayString& strings);
     void GetStrings(wxArrayString& strings) const;
 
     void SetStrings(const wxArrayString& strings);
     void GetStrings(wxArrayString& strings) const;


@@ -51,6 +71,14 @@ protected:
     int m_selection;
     long m_style;
 
     int m_selection;
     long m_style;
 

+    void Init()
+    {
+        m_style = 0;
+        m_selection = 0;
+        m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;
+        m_listCtrl = NULL;
+    }
+

     void OnItemSelected(wxListEvent& event);
     void OnEndLabelEdit(wxListEvent& event);
     void OnNewItem(wxCommandEvent& event);
     void OnItemSelected(wxListEvent& event);
     void OnEndLabelEdit(wxListEvent& event);
     void OnNewItem(wxCommandEvent& event);


@@ -63,4 +91,6 @@ protected:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#endif  // wxUSE_EDITABLELISTBOX
+

 #endif // __WX_EDITLBOX_H__
 #endif // __WX_EDITLBOX_H__