Cured last focus bug (I hope); some wxMotif mods

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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 7db33d7ad4d9b5d2d648103e87c1473c5de0c5ae..17702e03cba939933ede77f111b5a2b3a78b5281 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -26,7 +26,8 @@ class WXDLLEXPORT wxChoice: public wxControl
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
  public:
-  inline wxChoice() { m_noStrings = 0; }
+  wxChoice();
+  ~wxChoice();
 
   inline wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
@@ -54,18 +55,38 @@ 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);
 
   virtual inline int Number() const { return m_noStrings; }
   virtual void Command(wxCommandEvent& event);
 
-  virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;
-  virtual inline int GetColumns() const { return 1 ; };
+  virtual void SetColumns(int n = 1 );
+  virtual int GetColumns() const ;
+
+  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; }
 
 protected:
-  int m_noStrings;
+  int           m_noStrings;
+  WXWidget      m_menuWidget;
+  WXWidget      m_buttonWidget;
+  WXWidget*     m_widgetList ;
+  WXWidget      m_formWidget;
+  wxStringList  m_stringList;
 };
 
 #endif