moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index ea9854e3b8dd87409dbe44fba91b86947279b91e..6289745486902ab5791fa02a8afe428783bd4c60 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -1,75 +1,91 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.h
 // Purpose:     wxChoice class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.h
 // Purpose:     wxChoice class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 // Choice item

-class WXDLLEXPORT wxChoice: public wxControl
+class WXDLLEXPORT wxChoice: public wxChoiceBase

 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 

- public:
-  inline wxChoice() { m_noStrings = 0; }
+public:
+    // ctors
+    inline 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 *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             int n = 0, const wxString choices[] = NULL,
+             long style = 0,
+#if wxUSE_VALIDATORS
+             const wxValidator& validator = wxDefaultValidator,
+#endif
+             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);
+    bool Create(wxWindow *parent, wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             int n = 0, const wxString choices[] = NULL,
+             long style = 0,
+#if wxUSE_VALIDATORS
+             const wxValidator& validator = wxDefaultValidator,
+#endif
+             const wxString& name = wxChoiceNameStr);
+
+    // Implement base class virtuals
+    virtual int  DoAppend(const wxString& item);
+    virtual void Delete(int n);
+    virtual void Clear();

 
 

-  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 int GetCount() const;
+    virtual int GetSelection() const ;
+    virtual void SetSelection(int n);

 
 

-  virtual inline int Number() const { return m_noStrings; }
-  virtual void Command(wxCommandEvent& event);
+    virtual int FindString(const wxString& s) const;
+    virtual wxString GetString(int n) const ;
+    virtual void SetString(int n, const wxString& s);

 
 

-  virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;
-  virtual inline int GetColumns() const { return 1 ; };
+    // OS2 only
+    virtual bool OS2Command(WXUINT param, WXWORD id);
+    MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 protected:
 
 protected:

-  int m_noStrings;
+    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;

 
 

+    // OS2 implementation
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);

 private:
 private:

-  void SetSize(int width, int height) {wxWindow::SetSize(width, height);}
+    // Virtual function hiding supression
+/*
+    inline virtual void DoSetClientData( void *data )
+    { wxWindowBase::DoSetClientData(data); }
+    inline virtual void DoSetClientObject( wxClientData *data )
+    { wxWindowBase::DoSetClientObject(data); }
+    inline virtual wxClientData *DoGetClientObject() const
+    { return(wxWindowBase::DoGetClientObject());}
+    inline virtual void *DoGetClientData() const
+    { return(wxWindowBase::DoGetClientData());}
+*/

 };
 
 };
 

-#endif
-       // _WX_CHOICE_H_
+#endif // _WX_CHOICE_H_