wxCriticalSection implemented using mutexes for !MSW (sample compiles again)

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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index f9f0c43be9cf9bfc6114951caef6755a3f0fabda..1e3c872c5dd52474c11e743ce90b3c1024b42fc2 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -55,7 +55,12 @@ class WXDLLEXPORT wxChoice: public wxControl
   virtual void SetSelection(int n);
   virtual int FindString(const wxString& s) 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 wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 
@@ -68,7 +73,7 @@ class WXDLLEXPORT wxChoice: public wxControl
   void SetFocus();
 
 // Implementation
-  virtual void ChangeFont();
+  virtual void ChangeFont(bool keepOriginalSize = TRUE);
   virtual void ChangeBackgroundColour();
   virtual void ChangeForegroundColour();
   WXWidget GetTopWidget() const { return m_formWidget; }