avoid warnings C4311/4312 when building with MSVC >= 7 (patch 1414052)

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index dc2659dac3915b97d8e158d219f67499d18d4ea8..46acf9a572e638efdb797c7a1e40c031a9201999 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 

-#ifdef __GNUG__
-    #pragma interface "listbox.h"
-#endif
-

 #if wxUSE_LISTBOX
 
 // ----------------------------------------------------------------------------
 #if wxUSE_LISTBOX
 
 // ----------------------------------------------------------------------------


@@ -28,11 +24,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 +49,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 +67,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();
 


@@ -71,24 +84,12 @@ public:
     virtual int GetCount() const;
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& s);
     virtual int GetCount() const;
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& s);

-    virtual int FindString(const wxString& s) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;

 
     virtual bool IsSelected(int n) const;
 
     virtual bool IsSelected(int n) const;

-    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;
 

-    virtual int DoAppend(const wxString& item);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
-
-    virtual void DoSetFirstItem(int n);
-
-    virtual void DoSetItemClientData(int n, void* clientData);
-    virtual void* DoGetItemClientData(int n) const;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(int n) const;
-

     // wxCheckListBox support
 #if wxUSE_OWNER_DRAWN
     bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
     // wxCheckListBox support
 #if wxUSE_OWNER_DRAWN
     bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);


@@ -111,10 +112,37 @@ public:
 
     // Windows callbacks
     bool MSWCommand(WXUINT param, WXWORD id);
 
     // Windows callbacks
     bool MSWCommand(WXUINT param, WXWORD id);

+    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // under XP when using "transition effect for menus and tooltips" if we
+    // return true for WM_PRINTCLIENT here then it causes noticable slowdown
+    virtual bool MSWShouldPropagatePrintChild()
+    {
+        return false;
+    }

 
 

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

 
 protected:
 
 protected:

+    virtual void DoSetSelection(int n, bool select);
+    virtual int DoAppend(const wxString& item);
+    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+    virtual void DoSetFirstItem(int n);
+    virtual void DoSetItemClientData(int n, void* clientData);
+    virtual void* DoGetItemClientData(int n) const;
+    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(int n) const;
+

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


@@ -129,7 +157,7 @@ protected:
 #endif
 
 private:
 #endif
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxListBox)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)

 };
 
 #endif // wxUSE_LISTBOX
 };
 
 #endif // wxUSE_LISTBOX