Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 1d19486a8a883df0afdc6e62b17a14bc6dddd8df..fb853df30294c1ba42dd9dc0d33cd932afbd8cc3 100644 (file)
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -12,19 +12,16 @@
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "listbox.h"
 #endif
 
 #include "wx/ctrlsub.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
+#include "wx/clntdata.h"
 
 // forward decl for GetSelections()
 class WXDLLEXPORT wxArrayInt;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
-
 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
 {
@@ -38,12 +35,22 @@ public:
         int n = 0, const wxString choices[] = NULL,
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr):
-    m_clientDataList(wxKEY_INTEGER)
+        const wxString& name = wxListBoxNameStr)
     {
         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,
@@ -52,77 +59,58 @@ public:
         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();
     
-    // Virtual functions required by wxControlWithItems.
-    // They are not all implemented yet :-(
+    // implementation of wxControlWithItems
     virtual int GetCount() 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;
-    virtual void Select(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);
-            void Set(const wxArrayString& items, void **clientData = NULL)
-                { DoSetItems(items, clientData); }
-    virtual int FindString(const wxString& s) const ;
-    virtual void Clear();
-    virtual void SetSelection(int n, bool select = TRUE);
-    
-    virtual void Deselect(int n);
-    
-    // For single choice list item only
-    virtual int GetSelection() const ;
+    virtual int GetSelection() const;
     virtual void Delete(int n);
-    virtual void *GetClientData(int n) const ;
-    virtual void *GetClientData() { return wxWindow::GetClientData(); }
-    virtual void SetClientData(int n, void *clientData);
-    virtual void SetClientData( void *data ) { wxWindow::SetClientData(data); }
+    virtual int FindString(const wxString& s) const;
+    virtual void Clear();
     virtual void SetString(int n, const wxString& s);
-    
-    // For single or multiple choice list item
+    virtual wxString GetString(int n) const;
+
+    // implementation of wxListBoxbase
+    virtual void DoSetSelection(int n, bool select);
+    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+    virtual void DoSetFirstItem(int n);
     virtual int GetSelections(wxArrayInt& aSelections) const;
-    virtual bool IsSelected(int n) const ;
-    virtual wxString GetString(int n) const ;
-    
-    // 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 void InsertItems(int nItems, const wxString items[], int pos);
-            void InsertItems(const wxArrayString& items, int pos)
-                { DoInsertItems(items, pos); }
+    virtual bool IsSelected(int n) const;
 
-    virtual wxString GetStringSelection() const ;
-    virtual bool SetStringSelection(const wxString& s, bool flag = TRUE);
-    virtual int Number() const ;
-    
+    // For single or multiple choice list item
     void Command(wxCommandEvent& event);
     
     // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const;
-    
+
+#if wxUSE_CHECKLISTBOX
+    virtual void DoToggleItem(int item, int x) {};
+#endif
 protected:
+    virtual wxSize DoGetBestSize() const;
+
     int       m_noItems;
-    int       m_selected;
     
     // List mapping positions->client data
-    wxList    m_clientDataList;
-    
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
+    wxClientDataDictionary m_clientDataDict;
+private:
+    void SetSelectionPolicy();
 };
 
 #endif