Implemented Enable for wxMenuBar to avoid assert

[wxWidgets.git] / include / wx / univ / listbox.h

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 01ad0a276c177c6211674338a9f6bdf96de85cdd..acc660541a78e5bb164c4250631a3d5e37c64b94 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -12,12 +12,13 @@
 #ifndef _WX_UNIV_LISTBOX_H_
 #define _WX_UNIV_LISTBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "univlistbox.h"
 #endif
 
 #include "wx/scrolwin.h"    // for wxScrollHelper
 #include "wx/dynarray.h"
+#include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------
 // the actions supported by this control
@@ -69,6 +70,14 @@ public:
 
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
+    wxListBox(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos,
+              const wxSize& size,
+              const wxArrayString& choices,
+              long style = 0,
+              const wxValidator& validator = wxDefaultValidator,
+              const wxString& name = wxListBoxNameStr );
 
     virtual ~wxListBox();
 
@@ -80,16 +89,24 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
 
     // implement the listbox interface defined by wxListBoxBase
     virtual void Clear();
     virtual void Delete(int n);
 
-    virtual int GetCount() const { return (int)m_strings.GetCount(); }
-    virtual wxString GetString(int n) const { return m_strings[n]; }
+    virtual int GetCount() const { return (int)m_strings->GetCount(); }
+    virtual wxString GetString(int n) const { return (*m_strings)[n]; }
     virtual void SetString(int n, const wxString& s);
     virtual int FindString(const wxString& s) const
-        { return m_strings.Index(s); }
+        { return IsSorted() ? m_stringsSorted->Index(s) : m_strings->Index(s); }
 
     virtual bool IsSelected(int n) const
         { return m_selections.Index(n) != wxNOT_FOUND; }
@@ -166,8 +183,8 @@ public:
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 
-    // let wxColourScheme choose the right colours for us
-    virtual bool IsContainerWindow() const { return TRUE; }
+    // idle processing
+    virtual void OnInternalIdle();
 
 protected:
     // geometry
@@ -183,7 +200,6 @@ protected:
     void Init();
 
     // event handlers
-    void OnIdle(wxIdleEvent& event);
     void OnSize(wxSizeEvent& event);
 
     // common part of Clear() and DoSetItems(): clears everything
@@ -222,8 +238,14 @@ protected:
     void UpdateItems();
 
     // the array containing all items (it is sorted if the listbox has
-    // wxLB_SORT style)
-    wxArrayString m_strings;
+    // wxLB_SORT style). Note the evil trick: the pointers share the
+    // same location, hence we use m_strings when we don't care if the
+    // array is sorted or not, m_stringsSorted when we do
+    union
+    {
+        wxArrayString* m_strings;
+        wxSortedArrayString* m_stringsSorted;
+    };
 
     // this array contains the indices of the selected items (for the single
     // selection listboxes only the first element of it is used and contains