fix typo in drawing slider ticks; added assert to check for it (slightly modified...

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index ac07defc279e08bc0280c65ad51e578949dc1c44..0b98232f3ded847aeafd3a8f2b064f508f194af3 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -12,7 +12,7 @@
 #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(__APPLE__)

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


@@ -44,6 +44,9 @@ 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; }
 

+    // append several items at once to the control
+    void Append(const wxArrayString& strings);
+

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


@@ -102,6 +105,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