Implemented Enable for wxMenuBar to avoid assert

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index 883bfe3423f7fcf392045ba7c83e7c5db8c65388..9293bdab9f2f22ddc14e8ce13cd320998b9cfaeb 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -12,8 +12,6 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-

 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
 // Choice item
 class WXDLLEXPORT wxChoice: public wxChoiceBase
 {


@@ -30,9 +28,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
                    )
     {


@@ -43,9 +39,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
               );
     }


@@ -57,16 +72,25 @@ 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
     //
     virtual int      DoAppend(const wxString& rsItem);
     //
     // Implement base class virtuals
     //
     virtual int      DoAppend(const wxString& rsItem);

+    virtual int      DoInsert(const wxString& rsItem, int pos);

     virtual void     Delete(int n);
     virtual void     Clear(void);
 
     virtual void     Delete(int n);
     virtual void     Clear(void);