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

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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 30423c0e96138c66a3f75de321605f6b065cb3b2..17702e03cba939933ede77f111b5a2b3a78b5281 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -55,7 +55,13 @@ 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 void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
+
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 
@@ -67,6 +73,10 @@ class WXDLLEXPORT wxChoice: public wxControl
 
   void SetFocus();
 
+// Implementation
+  virtual void ChangeFont(bool keepOriginalSize = TRUE);
+  virtual void ChangeBackgroundColour();
+  virtual void ChangeForegroundColour();
   WXWidget GetTopWidget() const { return m_formWidget; }
   WXWidget GetMainWidget() const { return m_buttonWidget; }
 
@@ -77,8 +87,6 @@ protected:
   WXWidget*     m_widgetList ;
   WXWidget      m_formWidget;
   wxStringList  m_stringList;
-public:
-  bool          m_inSetValue;
 };
 
 #endif