Added wx/listbase.h with wxListCtrl types, so we can

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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 7db33d7ad4d9b5d2d648103e87c1473c5de0c5ae..821f16096a1ed2de6512a180a7454c760c75a8c8 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -16,57 +16,92 @@
 #pragma interface "choice.h"
 #endif
 
-#include "wx/control.h"
+#include "wx/ctrlsub.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 // Choice item
-class WXDLLEXPORT wxChoice: public wxControl
+class WXDLLEXPORT wxChoice: public wxControlWithItems
 {
-  DECLARE_DYNAMIC_CLASS(wxChoice)
-
- public:
-  inline wxChoice() { m_noStrings = 0; }
-
-  inline wxChoice(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxChoiceNameStr)
-  {
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxChoiceNameStr);
-
-  virtual void Append(const wxString& item);
-  virtual void Delete(int n);
-  virtual void Clear();
-  virtual int GetSelection() const ;
-  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 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 ; };
-
+    DECLARE_DYNAMIC_CLASS(wxChoice)
+        
+public:
+    wxChoice();
+    ~wxChoice();
+    
+    wxChoice(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr)
+    {
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+    
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr);
+    
+    // Virtual functions required by wxControlWithItems.
+    // They are not all implemented yet :-(
+    virtual int GetCount() const;
+    virtual int DoAppend(const wxString& item);
+    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+    virtual void DoSetFirstItem(int n);
+    virtual void DoSetItemClientData(int n, void* clientData);
+    virtual void* DoGetItemClientData(int n) const;
+    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(int n) const;
+    virtual void Select(int n);
+    virtual void SetString(int n, const wxString& s);
+    
+    // Original API
+    virtual void Append(const wxString& item);
+    virtual void Delete(int n);
+    virtual void Clear();
+    virtual int GetSelection() const ;
+    virtual void SetSelection(int n);
+    virtual int FindString(const wxString& s) const;
+    virtual wxString GetString(int n) const ;
+    
+    virtual wxString GetStringSelection() const ;
+    virtual bool SetStringSelection(const wxString& sel);
+    
+    virtual int Number() const { return m_noStrings; }
+    virtual void Command(wxCommandEvent& event);
+    
+    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;
+    wxList        m_clientList;    // contains the client data for the items
+     
+    virtual void DoSetSize(int x, int y,
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);
 };
 
 #endif
-       // _WX_CHOICE_H_
+// _WX_CHOICE_H_