X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..e1ee679c2e3f48bc4f2607e35033ed5505ed6665:/include/wx/msw/listbox.h

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index fecc9b2fbc..6d1d8c0ba6 100644
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -18,118 +18,123 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
 
 #if wxUSE_OWNER_DRAWN
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items
   #include  <wx/dynarray.h>
-  WX_DEFINE_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
+
+  WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
+
 #endif
 
 // forward decl for GetSelections()
 class wxArrayInt;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // List box item
-class WXDLLEXPORT wxListBox: public wxControl
+class WXDLLEXPORT wxListBox : public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxListBox)
- public:
-
-  wxListBox(void);
-  inline wxListBox(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxListBoxNameStr)
-  {
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxListBoxNameStr);
-
-  ~wxListBox();
-
-  bool MSWCommand(WXUINT param, WXWORD id);
+    DECLARE_DYNAMIC_CLASS(wxListBox)
+
+public:
+    wxListBox();
+    wxListBox(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr)
+    {
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxListBoxNameStr);
+
+    ~wxListBox();
+
+    bool MSWCommand(WXUINT param, WXWORD id);
 
 #if wxUSE_OWNER_DRAWN
-  bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
-  bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+    bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
+    bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
-  // plug-in for derived classes
-  virtual wxOwnerDrawn *CreateItem(size_t n);
+    // plug-in for derived classes
+    virtual wxOwnerDrawn *CreateItem(size_t n);
 
-  // allows to get the item and use SetXXX functions to set it's appearance
-  wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
-#endif
+    // allows to get the item and use SetXXX functions to set it's appearance
+    wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
 
-  virtual void Append(const wxString& item);
-  virtual void Append(const wxString& item, char *clientData);
-  virtual void Set(int n, const wxString* choices, char **clientData = NULL);
-  virtual int FindString(const wxString& s) const ;
-  virtual void Clear(void);
-  virtual void SetSelection(int n, bool select = TRUE);
+    // get the index of the given item
+    int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
+#endif // wxUSE_OWNER_DRAWN
 
-  virtual void Deselect(int n);
+    virtual void Append(const wxString& item);
+    virtual void Append(const wxString& item, void *clientData);
+    virtual void Set(int n, const wxString* choices, void **clientData = NULL);
+    virtual int FindString(const wxString& s) const ;
+    virtual void Clear();
+    virtual void SetSelection(int n, bool select = TRUE);
 
-  // For single choice list item only
-  virtual int GetSelection() const ;
-  virtual void Delete(int n);
-  virtual char *GetClientData(int n) const ;
-  virtual void SetClientData(int n, char *clientData);
-  virtual void SetString(int n, const wxString& s);
+    virtual void Deselect(int n);
 
-  // For single or multiple choice list item
-  virtual int GetSelections(wxArrayInt& aSelections) const;
-  virtual bool Selected(int n) const ;
-  virtual wxString GetString(int n) const ;
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    // For single choice list item only
+    virtual int GetSelection() const ;
+    virtual void Delete(int n);
+    virtual void *GetClientData(int n) const ;
+    virtual void SetClientData(int n, void *clientData);
+    virtual void SetString(int n, const wxString& s);
 
-  // Set the specified item at the first visible item
-  // or scroll to max range.
-  virtual void SetFirstItem(int n) ;
-  virtual void SetFirstItem(const wxString& s) ;
+    // For single or multiple choice list item
+    virtual int GetSelections(wxArrayInt& aSelections) const;
+    virtual bool Selected(int n) const ;
+    virtual wxString GetString(int n) const ;
 
-  virtual void InsertItems(int nItems, const wxString items[], int pos);
+    // Set the specified item at the first visible item
+    // or scroll to max range.
+    virtual void SetFirstItem(int n) ;
+    virtual void SetFirstItem(const wxString& s) ;
 
-  virtual wxString GetStringSelection(void) const ;
-  virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
-  virtual int Number(void) const ;
+    virtual void InsertItems(int nItems, const wxString items[], int pos);
 
-  void Command(wxCommandEvent& event);
+    virtual wxString GetStringSelection() const ;
+    virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
+    virtual int Number() const ;
 
-  // 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.
-  virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
+    void Command(wxCommandEvent& event);
 
-  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-			WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    // 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.
+    virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
 
-  virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-  virtual void SetupColours(void);
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
- protected:
-  int m_noItems;
-  int m_selected;
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual void SetupColours();
+
+protected:
+    int m_noItems;
+    int m_selected;
+
+    virtual wxSize DoGetBestSize();
 
 #if wxUSE_OWNER_DRAWN
-  // control items
-  wxListBoxItemsArray m_aItems;
+    // control items
+    wxListBoxItemsArray m_aItems;
 #endif
-
 };
 
 #endif