Fix line endings

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 3a187be8700b57b3ad52a9df2a29279deabd92a5..afb1dd3aba2bff655b0197e5592c707875dcab65 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
 
 // ----------------------------------------------------------------------------


@@ -23,22 +19,22 @@
 // ----------------------------------------------------------------------------
 
 #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"
 

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


@@ -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,34 +67,25 @@ 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();
 

-    // implement base class pure virtuals
-    virtual void Clear();
-    virtual void Delete(int n);
-
-    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 unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);
+    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);


@@ -104,21 +101,56 @@ public:
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 

-    // Windows-specific code to set the horizontal extent of the listbox, if
-    // necessary. If s is non-NULL, it's used to calculate the horizontal
-    // extent. Otherwise, all strings are used.
+    // Windows-specific code to update the horizontal extent of the listbox, if
+    // necessary. If s is non-empty, the horizontal extent is increased to the
+    // length of this string if it's currently too short, otherwise the maximum
+    // extent of all strings is used. In any case calls InvalidateBestSize()

     virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
 
     // Windows callbacks
     bool MSWCommand(WXUINT param, WXWORD id);
     virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
 
     // 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);
+    }
+
+    // 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 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 int DoListHitTest(const wxPoint& point) const;
+

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

-    int m_noItems;
+    unsigned int m_noItems;

     int m_selected;
 
     virtual wxSize DoGetBestSize() const;
     int m_selected;
 
     virtual wxSize DoGetBestSize() const;