wxFileName size patch

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

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 4702db06a5e9469218c6828bed82574c2ec427b2..c0c4d1b56ff9e17856c25c6438cc8c25c9e6796b 100644 (file)
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -1,36 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.h
+// Name:        wx/motif/listbox.h
 // Purpose:     wxListBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
-#ifdef __GNUG__
-#pragma interface "listbox.h"
-#endif
-
 #include "wx/ctrlsub.h"
 #include "wx/clntdata.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
-
 // forward decl for GetSelections()
 class WXDLLEXPORT wxArrayInt;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxListBox)
-        
+
 public:
     wxListBox();
     wxListBox(wxWindow *parent, wxWindowID id,
@@ -43,7 +35,18 @@ public:
     {
         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,
         const wxSize& size = wxDefaultSize,
@@ -51,26 +54,34 @@ public:
         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);
+
     ~wxListBox();
-    
+
     // implementation of wxControlWithItems
-    virtual int GetCount() const;
+    virtual unsigned int GetCount() const;
     virtual int DoAppend(const wxString& item);
-    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;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
     virtual int GetSelection() const;
-    virtual void Delete(int n);
-    virtual int FindString(const wxString& s) const;
+    virtual void Delete(unsigned int n);
+    virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual void Clear();
-    virtual void SetString(int n, const wxString& s);
-    virtual wxString GetString(int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
 
     // implementation of wxListBoxbase
-    virtual void SetSelection(int n, bool select = TRUE);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoSetSelection(int n, bool select);
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoSetFirstItem(int n);
     virtual int GetSelections(wxArrayInt& aSelections) const;
@@ -78,20 +89,20 @@ public:
 
     // For single or multiple choice list item
     void Command(wxCommandEvent& event);
-    
+
     // Implementation
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const;
 
 #if wxUSE_CHECKLISTBOX
-    virtual void DoToggleItem(int item, int x) {};
+    virtual void DoToggleItem(int WXUNUSED(item), int WXUNUSED(x)) {};
 #endif
 protected:
     virtual wxSize DoGetBestSize() const;
 
-    int       m_noItems;
-    
+    unsigned int m_noItems;
+
     // List mapping positions->client data
     wxClientDataDictionary m_clientDataDict;
 private: