no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / msw / listbox.h

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index afe5f34d1e8d513ec34ac754a42a663ac7e32b0e..2d77f86c1a8263a7dc9607ed6c644c7915042bc2 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -19,7 +19,7 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN

-  class WXDLLEXPORT wxOwnerDrawn;
+  class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;

 
   // define the array of list box items
   #include  "wx/dynarray.h"
 
   // define the array of list box items
   #include  "wx/dynarray.h"


@@ -28,13 +28,13 @@
 #endif // wxUSE_OWNER_DRAWN
 
 // forward decl for GetSelections()
 #endif // wxUSE_OWNER_DRAWN
 
 // forward decl for GetSelections()

-class WXDLLIMPEXP_BASE wxArrayInt;
+class WXDLLIMPEXP_FWD_BASE wxArrayInt;

 
 // ----------------------------------------------------------------------------
 // List box control
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // List box control
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListBox : public wxListBoxBase
+class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -77,10 +77,6 @@ public:
 
     virtual ~wxListBox();
 
 
     virtual ~wxListBox();
 

-    // implement base class pure virtuals
-    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);


@@ -133,23 +129,31 @@ public:
         return GetCompositeControlsDefaultAttributes(variant);
     }
 
         return GetCompositeControlsDefaultAttributes(variant);
     }
 

+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
 protected:

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

     virtual void DoSetSelection(int n, bool select);
     virtual void DoSetSelection(int n, bool select);

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

     virtual void DoSetFirstItem(int n);
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;
     virtual void DoSetFirstItem(int n);
     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;

     virtual int DoListHitTest(const wxPoint& point) const;
 
     virtual int DoListHitTest(const wxPoint& point) const;
 

+    bool m_updateHorizontalExtent;
+    virtual void OnInternalIdle();
+

     // free memory (common part of Clear() and dtor)
     void Free();
 
     unsigned int m_noItems;
     // free memory (common part of Clear() and dtor)
     void Free();
 
     unsigned int m_noItems;

-    int m_selected;

 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;