silenced Watcom warning when deleting const pointer

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index ff5f02fe574e242e85b721dbed9ad7088f8371d2..9939f9a7df0acc471b4b5f5787af21f67eddc0ae 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -38,24 +38,24 @@ public:
     // accessing strings
     // -----------------
 
     // accessing strings
     // -----------------
 

-    virtual int GetCount() const = 0;
+    virtual unsigned int GetCount() const = 0;

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

-    virtual wxString GetString(int n) const = 0;
+    virtual wxString GetString(unsigned int n) const = 0;

     wxArrayString GetStrings() const;
     wxArrayString GetStrings() const;

-    virtual void SetString(int n, const wxString& s) = 0;
+    virtual void SetString(unsigned int n, const wxString& s) = 0;

 
     // finding string natively is either case sensitive or insensitive
     // but never both so fall back to this base version for not
     // supported search type
     virtual int FindString(const wxString& s, bool bCase = false) const
     {
 
     // finding string natively is either case sensitive or insensitive
     // but never both so fall back to this base version for not
     // supported search type
     virtual int FindString(const wxString& s, bool bCase = false) const
     {

-        int count = GetCount();
+        unsigned int count = GetCount();

 
 

-        for ( int i = 0; i < count ; i ++ )
+        for ( unsigned int i = 0; i < count ; ++i )

         {
             if (GetString(i).IsSameAs( s , bCase ))
         {
             if (GetString(i).IsSameAs( s , bCase ))

-                return i;
+                return (int)i;

         }
 
         return wxNOT_FOUND;
         }
 
         return wxNOT_FOUND;


@@ -82,7 +82,8 @@ public:
 protected:
 
     // check that the index is valid
 protected:
 
     // check that the index is valid

-    inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
+    inline bool IsValid(unsigned int n) const { return n < GetCount(); }
+    inline bool IsValidInsert(unsigned int n) const { return n <= GetCount(); }

 };
 
 class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable
 };
 
 class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable


@@ -108,46 +109,41 @@ public:
     // append several items at once to the control
     void Append(const wxArrayString& strings);
 
     // append several items at once to the control
     void Append(const wxArrayString& strings);
 

-    int Insert(const wxString& item, int pos)
+    int Insert(const wxString& item, unsigned int pos)

         { return DoInsert(item, pos); }
         { return DoInsert(item, pos); }

-    int Insert(const wxString& item, int pos, void *clientData);
-    int Insert(const wxString& item, int pos, wxClientData *clientData);
+    int Insert(const wxString& item, unsigned int pos, void *clientData);
+    int Insert(const wxString& item, unsigned int pos, wxClientData *clientData);

 
     // deleting items
     // --------------
 
     virtual void Clear() = 0;
 
     // deleting items
     // --------------
 
     virtual void Clear() = 0;

-    virtual void Delete(int n) = 0;
+    virtual void Delete(unsigned int n) = 0;

 
     // misc
     // ----
 
     // client data stuff
 
     // misc
     // ----
 
     // client data stuff

-    void SetClientData(int n, void* clientData);
-    void* GetClientData(int n) const;
+    void SetClientData(unsigned int n, void* clientData);
+    void* GetClientData(unsigned int n) const;

 
 

-    void SetClientObject(int n, wxClientData* clientData);
-    wxClientData* GetClientObject(int n) const;
+    void SetClientObject(unsigned int n, wxClientData* clientData);
+    wxClientData* GetClientObject(unsigned int n) const;

 
     bool HasClientObjectData() const
         { return m_clientDataItemsType == wxClientData_Object; }
     bool HasClientUntypedData() const
         { return m_clientDataItemsType == wxClientData_Void; }
 
 
     bool HasClientObjectData() const
         { return m_clientDataItemsType == wxClientData_Object; }
     bool HasClientUntypedData() const
         { return m_clientDataItemsType == wxClientData_Void; }
 

-#if WXWIN_COMPATIBILITY_2_2
-    // compatibility - these functions are deprecated, use the new ones
-    // instead
-    wxDEPRECATED( int Number() const );
-#endif // WXWIN_COMPATIBILITY_2_2
-

 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 int DoInsert(const wxString& item, unsigned int pos) = 0;
+
+    virtual void DoSetItemClientData(unsigned int n, void* clientData) = 0;
+    virtual void* DoGetItemClientData(unsigned int n) const = 0;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData) = 0;
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const = 0;

 
 

-    virtual void DoSetItemClientData(int n, void* clientData) = 0;
-    virtual void* DoGetItemClientData(int n) const = 0;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData) = 0;
-    virtual wxClientData* DoGetItemClientObject(int n) const = 0;

 
     // the type of the client data for the items
     wxClientDataType m_clientDataItemsType;
 
     // the type of the client data for the items
     wxClientDataType m_clientDataItemsType;


@@ -159,20 +155,20 @@ protected:
 // two versions
 #define wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST                    \
     void SetClientData(void *data)                                         \
 // two versions
 #define wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST                    \
     void SetClientData(void *data)                                         \

-        { wxControl::SetClientData(data); }                                \
+        { wxEvtHandler::SetClientData(data); }                             \

     void *GetClientData() const                                            \
     void *GetClientData() const                                            \

-        { return wxControl::GetClientData(); }                             \
+        { return wxEvtHandler::GetClientData(); }                          \

     void SetClientObject(wxClientData *data)                               \
     void SetClientObject(wxClientData *data)                               \

-        { wxControl::SetClientObject(data); }                              \
+        { wxEvtHandler::SetClientObject(data); }                           \

     wxClientData *GetClientObject() const                                  \
     wxClientData *GetClientObject() const                                  \

-        { return wxControl::GetClientObject(); }                           \
-    void SetClientData(int n, void* clientData)                            \
+        { return wxEvtHandler::GetClientObject(); }                        \
+    void SetClientData(unsigned int n, void* clientData)                   \

         { wxItemContainer::SetClientData(n, clientData); }                 \
         { wxItemContainer::SetClientData(n, clientData); }                 \

-    void* GetClientData(int n) const                                       \
+    void* GetClientData(unsigned int n) const                              \

         { return wxItemContainer::GetClientData(n); }                      \
         { return wxItemContainer::GetClientData(n); }                      \

-    void SetClientObject(int n, wxClientData* clientData)                  \
+    void SetClientObject(unsigned int n, wxClientData* clientData)         \

         { wxItemContainer::SetClientObject(n, clientData); }               \
         { wxItemContainer::SetClientObject(n, clientData); }               \

-    wxClientData* GetClientObject(int n) const                             \
+    wxClientData* GetClientObject(unsigned int n) const                    \

         { return wxItemContainer::GetClientObject(n); }
 
 class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
         { return wxItemContainer::GetClientObject(n); }
 
 class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer


@@ -193,16 +189,14 @@ public:
     virtual bool ShouldInheritColours() const { return false; }
 
 protected:
     virtual bool ShouldInheritColours() const { return false; }
 
 protected:

-    // we can't compute our best size before the items are added to the control
-    // which is done after calling SetInitialBestSize() (it is called from the
-    // base class ctor and the items are added in the derived class ctor), so
-    // don't do anything at all here as our size will be changed later anyhow
+    // fill in the client object or data field of the event as appropriate

     //
     //

-    // of course, all derived classes *must* call SetBestSize() from their
-    // ctors for this to work!
-    virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
+    // calls InitCommandEvent() and, if n != wxNOT_FOUND, also sets the per
+    // item client data
+    void InitCommandEventWithItems(wxCommandEvent& event, int n);

 
 private:
 
 private:

+    DECLARE_ABSTRACT_CLASS(wxControlWithItems)

     DECLARE_NO_COPY_CLASS(wxControlWithItems)
 };
 
     DECLARE_NO_COPY_CLASS(wxControlWithItems)
 };
 


@@ -211,15 +205,6 @@ private:
 // inline functions
 // ----------------------------------------------------------------------------
 
 // inline functions
 // ----------------------------------------------------------------------------
 

-#if WXWIN_COMPATIBILITY_2_2
-
-inline int wxItemContainer::Number() const
-{
-    return GetCount();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-

 #endif // wxUSE_CONTROLS
 
 #endif // _WX_CTRLSUB_H_BASE_
 #endif // wxUSE_CONTROLS
 
 #endif // _WX_CTRLSUB_H_BASE_