fix for [ 1020924 ] wx.Display.IsPrimary is wrong

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index a994417d49b4ced71c1947458fbc2cfc90f07489..d0acdcb94974a07955e4a3deb650ccab8a67daf0 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -28,11 +28,11 @@
   // define the array of list box items
   #include  "wx/dynarray.h"
 
   // define the array of list box items
   #include  "wx/dynarray.h"
 

-  WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxOwnerDrawn *, wxListBoxItemsArray);
+  WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray);

 #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


@@ -53,6 +53,16 @@ public:
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }

+    wxListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr)
+    {
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }

 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,


@@ -61,6 +71,13 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);

+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);

 
     virtual ~wxListBox();
 
 
     virtual ~wxListBox();
 


@@ -74,9 +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);
-    // rtti needs a function with just one signature
-    void SetSelectionLine(int n) { SetSelection( n ) ; }
+    virtual void SetSelection(int n, bool select = true);

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


@@ -114,9 +129,20 @@ 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;
+

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