Added a few files; fixed some warnings and wxMotif compile problems

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

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 77315ae0fe741651da5275dab28890c7e8115e5e..5d3d61ca42ac69f5e8f6225a49fd2792d4c20b44 100644 (file)
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -67,14 +67,21 @@ class WXDLLEXPORT wxListBox: public wxControl
   virtual int GetSelection() const ;
   virtual void Delete(int n);
   virtual char *GetClientData(int n) const ;
   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(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 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(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.
 
   // Set the specified item at the first visible item
   // or scroll to max range.


@@ -90,7 +97,7 @@ class WXDLLEXPORT wxListBox: public wxControl
   void Command(wxCommandEvent& event);
 
 // Implementation
   void Command(wxCommandEvent& event);
 
 // Implementation

-  virtual void ChangeFont();
+  virtual void ChangeFont(bool keepOriginalSize = TRUE);

   virtual void ChangeBackgroundColour();
   virtual void ChangeForegroundColour();
   WXWidget GetTopWidget() const;
   virtual void ChangeBackgroundColour();
   virtual void ChangeForegroundColour();
   WXWidget GetTopWidget() const;