* Added GetAppMenuBar

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index e2ef39df3678a4f8e0b91264ef4593a9815df44e..fbe39dc4b9de316f79e6e32beac40825eec1afcd 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -6,13 +6,13 @@
 // Created:     22.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     22.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CTRLSUB_H_BASE_
 #define _WX_CTRLSUB_H_BASE_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CTRLSUB_H_BASE_
 #define _WX_CTRLSUB_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "controlwithitems.h"
 #endif
 
     #pragma interface "controlwithitems.h"
 #endif
 


@@ -32,6 +32,7 @@ class WXDLLEXPORT wxItemContainer
 {
 public:
     wxItemContainer() { m_clientDataItemsType = wxClientData_None; }
 {
 public:
     wxItemContainer() { m_clientDataItemsType = wxClientData_None; }

+    virtual ~wxItemContainer();

 
     // adding items
     // ------------
 
     // adding items
     // ------------


@@ -43,6 +44,18 @@ public:
     int Append(const wxString& item, wxClientData *clientData)
         { int n = DoAppend(item); SetClientObject(n, clientData); return n; }
 
     int Append(const wxString& item, wxClientData *clientData)
         { int n = DoAppend(item); SetClientObject(n, clientData); return n; }
 

+    // only for rtti needs (separate name)
+    void AppendString( const wxString& item)
+    { Append( item ) ; }
+
+    // append several items at once to the control
+    void Append(const wxArrayString& strings);
+
+    int Insert(const wxString& item, int pos)
+        { return DoInsert(item, pos); }
+    int Insert(const wxString& item, int pos, void *clientData);
+    int Insert(const wxString& item, int pos, wxClientData *clientData);
+

     // deleting items
     // --------------
 
     // deleting items
     // --------------
 


@@ -53,7 +66,10 @@ public:
     // -----------------
 
     virtual int GetCount() const = 0;
     // -----------------
 
     virtual int GetCount() const = 0;

+    bool IsEmpty() const { return GetCount() == 0; }
+

     virtual wxString GetString(int n) const = 0;
     virtual wxString GetString(int n) const = 0;

+    wxArrayString GetStrings() const;

     virtual void SetString(int n, const wxString& s) = 0;
     virtual int FindString(const wxString& s) const = 0;
 
     virtual void SetString(int n, const wxString& s) = 0;
     virtual int FindString(const wxString& s) const = 0;
 


@@ -86,12 +102,9 @@ public:
     int Number() const { return GetCount(); }
 #endif // WXWIN_COMPATIBILITY_2_2
 
     int Number() const { return GetCount(); }
 #endif // WXWIN_COMPATIBILITY_2_2
 

-#ifdef __WXMAC_X__
-    virtual ~wxItemContainer() {}  // Added min for Mac X
-#endif
-

 protected:
     virtual int DoAppend(const wxString& item) = 0;
 protected:
     virtual int DoAppend(const wxString& item) = 0;

+    virtual int DoInsert(const wxString& item, int pos) = 0;

 
     virtual void DoSetItemClientData(int n, void* clientData) = 0;
     virtual void* DoGetItemClientData(int n) const = 0;
 
     virtual void DoSetItemClientData(int n, void* clientData) = 0;
     virtual void* DoGetItemClientData(int n) const = 0;


@@ -105,6 +118,9 @@ protected:
 class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
 {
 public:
 class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
 {
 public:

+    wxControlWithItems() { }
+    virtual ~wxControlWithItems();
+    

     // we have to redefine these functions here to avoid ambiguities in classes
     // deriving from us which would arise otherwise because both base classses
     // have the methods with the same names - hopefully, a smart compiler can
     // we have to redefine these functions here to avoid ambiguities in classes
     // deriving from us which would arise otherwise because both base classses
     // have the methods with the same names - hopefully, a smart compiler can


@@ -150,6 +166,9 @@ public:
     {
         return wxItemContainer::GetClientObject(n);
     }
     {
         return wxItemContainer::GetClientObject(n);
     }

+
+private:
+    DECLARE_NO_COPY_CLASS(wxControlWithItems)

 };
 
 #endif // wxUSE_CONTROLS
 };
 
 #endif // wxUSE_CONTROLS