Added C/wxString array constructors to wxArrayString

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 5ab31ebbedf973cc5040d7fde57bd29201b9c4ad..a901adf31c8fc211d72e26308f82561866fe0375 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -32,7 +32,7 @@
 #endif // wxUSE_OWNER_DRAWN
 
 // forward decl for GetSelections()
 #endif // wxUSE_OWNER_DRAWN
 
 // forward decl for GetSelections()

-class wxArrayInt;
+class WXDLLIMPEXP_BASE wxArrayInt;

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


@@ -91,7 +91,7 @@ public:
     virtual int FindString(const wxString& s) const;
 
     virtual bool IsSelected(int n) const;
     virtual int FindString(const wxString& s) const;
 
     virtual bool IsSelected(int n) const;

-    virtual void SetSelection(int n, bool select = TRUE);
+    virtual void DoSetSelection(int n, bool select);

     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 


@@ -129,9 +129,25 @@ public:
     // Windows callbacks
     bool MSWCommand(WXUINT param, WXWORD id);
 
     // Windows callbacks
     bool MSWCommand(WXUINT param, WXWORD id);
 

-    virtual void SetupColours();
+    virtual wxVisualAttributes GetDefaultAttributes() const
+    {
+        return GetClassDefaultAttributes(GetWindowVariant());
+    }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL)
+    {
+        return GetCompositeControlsDefaultAttributes(variant);
+    }

 
 protected:
 
 protected:

+    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    virtual WXHBRUSH MSWControlColor(WXHDC pDC)
+    {
+        return MSWControlColorSolid(pDC);
+    }
+

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