Implement GetPageText for the OSX WebKit implementation.

[wxWidgets.git] / include / wx / generic / bmpcbox.h

diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h
index e192470c4e8aca47301acf97dea8c085a4d4cae1..3ea404a5e4b2a14c5cf1d0b2134095383f2255fe 100644 (file)
--- a/include/wx/generic/bmpcbox.h
+++ b/include/wx/generic/bmpcbox.h
@@ -98,20 +98,9 @@ public:
     int Insert(const wxString& item, const wxBitmap& bitmap,
                unsigned int pos, wxClientData *clientData);
 
     int Insert(const wxString& item, const wxBitmap& bitmap,
                unsigned int pos, wxClientData *clientData);
 

-    // Returns size of image used in list.
-    virtual wxSize GetBitmapSize() const
-    {
-        return m_usedImgSize;
-    }
-
-    // Returns the image of the item with the given index.
-    virtual wxBitmap GetItemBitmap(unsigned int n) const;
-

     // Sets the image for the given item.
     virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);
     // Sets the image for the given item.
     virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);

-
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
+    virtual bool SetFont(const wxFont& font);

 
 protected:
 
 
 protected:
 


@@ -120,38 +109,25 @@ protected:
     virtual wxCoord OnMeasureItem(size_t item) const;
     virtual wxCoord OnMeasureItemWidth(size_t item) const;
 
     virtual wxCoord OnMeasureItem(size_t item) const;
     virtual wxCoord OnMeasureItemWidth(size_t item) const;
 

-    virtual int DoInsertItems(const wxArrayStringsAdapter & items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-
-    virtual bool SetFont(const wxFont& font);
-
-    virtual wxSize DoGetBestSize() const;
-

     // Event handlers
     void OnSize(wxSizeEvent& event);
 
     // Event handlers
     void OnSize(wxSizeEvent& event);
 

-    // Recalculates amount of empty space needed in front of
-    // text in control itself.
-    void DetermineIndent();
-
-    bool OnAddBitmap(const wxBitmap& bitmap);
-
-    // Adds image to position - called in Append/Insert before
-    // string is added.
-    bool DoInsertBitmap(const wxBitmap& image, unsigned int pos);
+    virtual wxSize DoGetBestSize() const;

 
 

+    virtual wxItemContainer* GetItemContainer() { return this; }
+    virtual wxWindow* GetControl() { return this; }

 
 

-    wxArrayPtrVoid      m_bitmaps;  // Images associated with items
-    wxSize              m_usedImgSize;  // Size of bitmaps
+    // wxItemContainer implementation
+    virtual int DoInsertItems(const wxArrayStringsAdapter & items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);

 
 private:
 
 private:

-    int                 m_imgAreaWidth;  // Width and height of area next to text field
-    int                 m_fontHeight;

     bool                m_inResize;
 
     void Init();
     bool                m_inResize;
 
     void Init();

-    void PostCreate();

 
     DECLARE_EVENT_TABLE()
 
 
     DECLARE_EVENT_TABLE()