X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54da4255a20216b070ec044ae2b8af75e9f2681f..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/os2/choice.h?ds=inline

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 7f360ed5cc..fc8ec9f976 100644
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -1,72 +1,135 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.h
+// Name:        wx/os2/choice.h
 // Purpose:     wxChoice class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/13/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#ifdef __GNUG__
-#pragma interface "choice.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-
+// ----------------------------------------------------------------------------
 // Choice item
-class WXDLLEXPORT wxChoice: public wxControl
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
- public:
-  inline wxChoice() { m_noStrings = 0; }
+public:
+    // ctors
+    inline wxChoice() { }
+    virtual ~wxChoice();
 
-  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);
-  }
+    inline wxChoice( wxWindow*          pParent
+                    ,wxWindowID         vId
+                    ,const wxPoint&     rPos = wxDefaultPosition
+                    ,const wxSize&      rSize = wxDefaultSize
+                    ,int                n = 0
+                    ,const wxString     asChoices[] = NULL
+                    ,long               lStyle = 0
+                    ,const wxValidator& rValidator = wxDefaultValidator
+                    ,const wxString&    rsName = wxChoiceNameStr
+                   )
+    {
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,n
+               ,asChoices
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
 
-  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);
+    inline wxChoice( wxWindow*            pParent
+                    ,wxWindowID           vId
+                    ,const wxPoint&       rPos
+                    ,const wxSize&        rSize
+                    ,const wxArrayString& asChoices
+                    ,long                 lStyle = 0
+                    ,const wxValidator&   rValidator = wxDefaultValidator
+                    ,const wxString&      rsName = wxChoiceNameStr
+                   )
+    {
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,asChoices
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
 
-  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);
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,int                n = 0
+                ,const wxString     asChoices[] = NULL
+                ,long               lStyle = 0
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxChoiceNameStr
+               );
 
-  virtual inline int Number() const { return m_noStrings; }
-  virtual void Command(wxCommandEvent& event);
+    bool Create( wxWindow*            pParent
+                ,wxWindowID           vId
+                ,const wxPoint&       rPos
+                ,const wxSize&        rSize
+                ,const wxArrayString& asChoices
+                ,long                 lStyle = 0
+                ,const wxValidator&   rValidator = wxDefaultValidator
+                ,const wxString&      rsName = wxChoiceNameStr
+               );
 
-  virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;
-  virtual inline int GetColumns() const { return 1 ; };
+    //
+    // Implement base class virtuals
+    //
+    virtual void     DoDeleteOneItem(unsigned int n);
+    virtual void     DoClear(void);
+
+    virtual unsigned int GetCount() const;
+    virtual int      GetSelection(void) const;
+    virtual void     SetSelection(int n);
+
+    virtual wxString GetString(unsigned int n) const;
+    virtual void     SetString(unsigned int n, const wxString& rsStr);
+
+    //
+    // OS2 only
+    //
+    virtual bool     OS2Command( WXUINT uParam
+                                ,WXWORD wId
+                               );
+    MRESULT          OS2WindowProc( WXUINT   uMsg
+                                   ,WXWPARAM wParam
+                                   ,WXLPARAM lParam
+                                  );
 
 protected:
-  int m_noStrings;
-};
+    virtual int           DoInsertItems(const wxArrayStringsAdapter& items,
+                                        unsigned int pos,
+                                        void **clientData,
+                                        wxClientDataType type);
+
+    virtual void          DoSetItemClientData(unsigned int n, void* pClientData);
+    virtual void*         DoGetItemClientData(unsigned int n) const;
+    virtual wxSize        DoGetBestSize(void) const;
+    virtual void          DoSetSize( int nX
+                                    ,int nY
+                                    ,int nWidth
+                                    ,int nHeight
+                                    ,int nsizeFlags = wxSIZE_AUTO
+                                   );
+    void                  Free(void);
+}; // end of CLASS wxChoice
 
-#endif
-	// _WX_CHOICE_H_
+#endif // _WX_CHOICE_H_