*** empty log message ***

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

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 5ba7762189e96658d8be2c8ef141cbd68a8a5af1..5d3d61ca42ac69f5e8f6225a49fd2792d4c20b44 100644 (file)
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -38,7 +38,8 @@ class WXDLLEXPORT wxListBox: public wxControl
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxListBoxNameStr)
+           const wxString& name = wxListBoxNameStr):
+              m_clientDataList(wxKEY_INTEGER)
   {
     Create(parent, id, pos, size, n, choices, style, validator, name);
   }
@@ -66,14 +67,21 @@ class WXDLLEXPORT wxListBox: public wxControl
   virtual int GetSelection() const ;
   virtual void Delete(int n);
   virtual char *GetClientData(int n) const ;
+  virtual void *GetClientData() { return wxWindow::GetClientData(); }
   virtual void SetClientData(int n, char *clientData);
+  virtual void SetClientData( void *data ) { wxWindow::SetClientData(data); }
   virtual void SetString(int n, 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 SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+  virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
 
   // Set the specified item at the first visible item
   // or scroll to max range.
@@ -88,9 +96,18 @@ class WXDLLEXPORT wxListBox: public wxControl
 
   void Command(wxCommandEvent& event);
 
- protected:
+// Implementation
+  virtual void ChangeFont(bool keepOriginalSize = TRUE);
+  virtual void ChangeBackgroundColour();
+  virtual void ChangeForegroundColour();
+  WXWidget GetTopWidget() const;
+
+protected:
   int       m_noItems;
   int       m_selected;
+
+  // List mapping positions->client data
+  wxList    m_clientDataList;
 };
 
 #endif