fixed all the other ports broken by controls labels in wxToolBar patch commit

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 103a6758082bca6d23740837e2f41beef01a6f44..8054f2234422fe39a64df49439cd20cbfec36452 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.h
+// Name:        wx/os2/choice.h

 // Purpose:     wxChoice class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxChoice class
 // Author:      David Webster
 // Modified by:


@@ -12,7 +12,10 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

+// ----------------------------------------------------------------------------

 // Choice item
 // Choice item

+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)


@@ -20,6 +23,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 public:
     // ctors
     inline wxChoice() { }
 public:
     // ctors
     inline wxChoice() { }

+    virtual ~wxChoice();

 
     inline wxChoice( wxWindow*          pParent
                     ,wxWindowID         vId
 
     inline wxChoice( wxWindow*          pParent
                     ,wxWindowID         vId


@@ -28,9 +32,7 @@ public:
                     ,int                n = 0
                     ,const wxString     asChoices[] = NULL
                     ,long               lStyle = 0
                     ,int                n = 0
                     ,const wxString     asChoices[] = NULL
                     ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                     ,const wxValidator& rValidator = wxDefaultValidator
                     ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                     ,const wxString&    rsName = wxChoiceNameStr
                    )
     {
                     ,const wxString&    rsName = wxChoiceNameStr
                    )
     {


@@ -41,9 +43,28 @@ public:
                ,n
                ,asChoices
                ,lStyle
                ,n
                ,asChoices
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif
+               ,rsName
+              );
+    }
+
+    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
               );
     }
                ,rsName
               );
     }


@@ -55,28 +76,32 @@ public:
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxChoiceNameStr
                );
 
                 ,const wxString&    rsName = wxChoiceNameStr
                );
 

+    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
+               );
+

     //
     // Implement base class virtuals
     //
     //
     // Implement base class virtuals
     //

-    virtual int      DoAppend(const wxString& rsItem);
-    virtual void     Delete(int n);
+    virtual void     Delete(unsigned int n);

     virtual void     Clear(void);
 
     virtual void     Clear(void);
 

-    virtual int      GetCount(void) const;
-    virtual int      GetSelection(void) const ;
+    virtual unsigned int GetCount() const;
+    virtual int      GetSelection(void) const;

     virtual void     SetSelection(int n);
 
     virtual void     SetSelection(int n);
 

-    virtual int      FindString(const wxString& rsStr) const;
-    virtual wxString GetString(int n) const ;
-    virtual void     SetString( int n
-                               ,const wxString& rsStr
-                              );
+    virtual wxString GetString(unsigned int n) const;
+    virtual void     SetString(unsigned int n, const wxString& rsStr);

 
     //
     // OS2 only
 
     //
     // OS2 only


@@ -90,14 +115,12 @@ public:
                                   );
 
 protected:
                                   );
 
 protected:

-    virtual void          DoSetItemClientData( int   n
-                                              ,void* pClientData
-                                             );
-    virtual void*         DoGetItemClientData(int n) const;
-    virtual void          DoSetItemClientObject( int           n
-                                                ,wxClientData* pClientData
-                                               );
-    virtual wxClientData* DoGetItemClientObject(int n) const;
+    virtual int           DoAppend(const wxString& rsItem);
+    virtual int           DoInsert(const wxString& rsItem, unsigned int pos);
+    virtual void          DoSetItemClientData(unsigned int n, void* pClientData);
+    virtual void*         DoGetItemClientData(unsigned int n) const;
+    virtual void          DoSetItemClientObject(unsigned int n, wxClientData* pClientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;

     virtual wxSize        DoGetBestSize(void) const;
     virtual void          DoSetSize( int nX
                                     ,int nY
     virtual wxSize        DoGetBestSize(void) const;
     virtual void          DoSetSize( int nX
                                     ,int nY