wxOSX build fix after wxTextEntry::GetValue() renaming to DoGetValue()

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

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index 334d725410ad22e5d41c7b91de74577e69f2328b..1c803aa5a2303396328bbd87fa53b561c88ffd1a 100644 (file)
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -40,7 +40,7 @@ enum
 //
 // Callback flags (see wxOwnerDrawnComboBox::OnDrawItem)
 //
 //
 // Callback flags (see wxOwnerDrawnComboBox::OnDrawItem)
 //

-enum
+enum wxOwnerDrawnComboBoxPaintingFlags

 {
     // when set, we are painting the selected item in control,
     // not in the popup
 {
     // when set, we are painting the selected item in control,
     // not in the popup


@@ -140,9 +140,10 @@ protected:
     // item: item index to be drawn, may be wxNOT_FOUND when painting combo control itself
     //       and there is no valid selection
     // flags: wxODCB_PAINTING_CONTROL is set if painting to combo control instead of list
     // item: item index to be drawn, may be wxNOT_FOUND when painting combo control itself
     //       and there is no valid selection
     // flags: wxODCB_PAINTING_CONTROL is set if painting to combo control instead of list

-    // NOTE: If wxVListBoxComboPopup is used with wxComboCtrl class not derived from
+    //
+    // NOTE: If wxVListBoxComboPopup is used with a wxComboCtrl class not derived from

     //       wxOwnerDrawnComboBox, this method must be overridden.
     //       wxOwnerDrawnComboBox, this method must be overridden.

-    virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags ) const;
+    virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags) const;

 
     // This is same as in wxVListBox
     virtual wxCoord OnMeasureItem( size_t item ) const;
 
     // This is same as in wxVListBox
     virtual wxCoord OnMeasureItem( size_t item ) const;


@@ -212,6 +213,8 @@ private:
     // Partial completion string
     wxString                m_partialCompletionString;
 
     // Partial completion string
     wxString                m_partialCompletionString;
 

+    wxString                m_stringValue;
+

 #if wxUSE_TIMER
     // Partial completion timer
     wxTimer                 m_partialCompletionTimer;
 #if wxUSE_TIMER
     // Partial completion timer
     wxTimer                 m_partialCompletionTimer;


@@ -304,8 +307,6 @@ public:
     }
 
     // wxControlWithItems methods
     }
 
     // wxControlWithItems methods

-    virtual void Clear();
-    virtual void Delete(unsigned int n);

     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);


@@ -327,9 +328,13 @@ public:
     // Return the index of the widest item (recalculating it if necessary)
     virtual int GetWidestItem() { EnsurePopupControl(); return GetVListBoxComboPopup()->GetWidestItem(); }
 
     // Return the index of the widest item (recalculating it if necessary)
     virtual int GetWidestItem() { EnsurePopupControl(); return GetVListBoxComboPopup()->GetWidestItem(); }
 

+    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
+

     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 protected:
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 protected:

+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);

 
     // Callback for drawing. Font, background and text colour have been
     // prepared according to selection, focus and such.
 
     // Callback for drawing. Font, background and text colour have been
     // prepared according to selection, focus and such.


@@ -359,12 +364,11 @@ protected:
         return (wxVListBoxComboPopup*) m_popupInterface;
     }
 
         return (wxVListBoxComboPopup*) m_popupInterface;
     }
 

-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, unsigned int pos);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);

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

-    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;

 
     // temporary storage for the initial choices
     //const wxString*         m_baseChoices;
 
     // temporary storage for the initial choices
     //const wxString*         m_baseChoices;