Make art provider id of type "char *" instead of "wxChar *".

[wxWidgets.git] / include / wx / vlbox.h

diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h
index 2301f7c651b020ac61de115336a980f598409c2d..96ab2bde6f3da88a98a3f7c5abe863fea0cb374d 100644 (file)
--- a/include/wx/vlbox.h
+++ b/include/wx/vlbox.h
@@ -16,8 +16,7 @@
 #include "wx/bitmap.h"
 
 class WXDLLIMPEXP_FWD_CORE wxSelectionStore;
 #include "wx/bitmap.h"
 
 class WXDLLIMPEXP_FWD_CORE wxSelectionStore;

-
-#define wxVListBoxNameStr _T("wxVListBox")
+extern WXDLLIMPEXP_DATA_CORE(const char) wxVListBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxVListBox
 
 // ----------------------------------------------------------------------------
 // wxVListBox


@@ -32,7 +31,7 @@ class WXDLLIMPEXP_FWD_CORE wxSelectionStore;
     It emits the same events as wxListBox and the same event macros may be used
     with it.
  */
     It emits the same events as wxListBox and the same event macros may be used
     with it.
  */

-class WXDLLEXPORT wxVListBox : public wxVScrolledWindow
+class WXDLLIMPEXP_CORE wxVListBox : public wxVScrolledWindow

 {
 public:
     // constructors and such
 {
 public:
     // constructors and such


@@ -86,7 +85,7 @@ public:
     int GetSelection() const
     {
         wxASSERT_MSG( !HasMultipleSelection(),
     int GetSelection() const
     {
         wxASSERT_MSG( !HasMultipleSelection(),

-                        _T("GetSelection() can't be used with wxLB_MULTIPLE") );
+                        wxT("GetSelection() can't be used with wxLB_MULTIPLE") );

 
         return m_current;
     }
 
         return m_current;
     }


@@ -127,6 +126,8 @@ public:
     // get the background colour of selected cells
     const wxColour& GetSelectionBackground() const { return m_colBgSel; }
 
     // get the background colour of selected cells
     const wxColour& GetSelectionBackground() const { return m_colBgSel; }
 

+    // get the item rect, returns empty rect if the item is not visible
+    wxRect GetItemRect(size_t n) const;

 
     // operations
     // ----------
 
     // operations
     // ----------


@@ -201,9 +202,9 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

-       virtual wxBorder GetDefaultBorder() const { return GetDefaultBorderForControl(); }
-

 protected:
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_THEME; }
+

     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC
     virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const = 0;
     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC
     virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const = 0;


@@ -241,12 +242,14 @@ protected:
     void OnLeftDown(wxMouseEvent& event);
     void OnLeftDClick(wxMouseEvent& event);
     void OnSetOrKillFocus(wxFocusEvent& event);
     void OnLeftDown(wxMouseEvent& event);
     void OnLeftDClick(wxMouseEvent& event);
     void OnSetOrKillFocus(wxFocusEvent& event);

+    void OnSize(wxSizeEvent& event);

 
     // common part of all ctors
     void Init();
 
     // send the wxEVT_COMMAND_LISTBOX_SELECTED event
     void SendSelectedEvent();
 
     // common part of all ctors
     void Init();
 
     // send the wxEVT_COMMAND_LISTBOX_SELECTED event
     void SendSelectedEvent();

+    virtual void InitEvent(wxCommandEvent& event, int n);

 
     // common implementation of SelectAll() and DeselectAll()
     bool DoSelectAll(bool select);
 
     // common implementation of SelectAll() and DeselectAll()
     bool DoSelectAll(bool select);


@@ -269,6 +272,14 @@ protected:
     // common part of keyboard and mouse handling processing code
     void DoHandleItemClick(int item, int flags);
 
     // common part of keyboard and mouse handling processing code
     void DoHandleItemClick(int item, int flags);
 

+    // paint the background of the given item using the provided colour if it's
+    // valid, otherwise just return false and do nothing (this is used by
+    // OnDrawBackground())
+    bool DoDrawSolidBackground(const wxColour& col,
+                               wxDC& dc,
+                               const wxRect& rect,
+                               size_t n) const;
+

 private:
     // the current item or wxNOT_FOUND
     //
 private:
     // the current item or wxNOT_FOUND
     //


@@ -293,7 +304,7 @@ private:
     wxColour m_colBgSel;
 
     DECLARE_EVENT_TABLE()
     wxColour m_colBgSel;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxVListBox)
+    wxDECLARE_NO_COPY_CLASS(wxVListBox);

     DECLARE_ABSTRACT_CLASS(wxVListBox)
 };
 
     DECLARE_ABSTRACT_CLASS(wxVListBox)
 };