Provide wxPGChoices ctor, Add(), Set() overloads taking wxStrings

Allow passing an array of wxStrings in addition to an array of wxChar*
strings.
This commit is contained in:
Vadim Zeitlin
2018-09-29 17:13:00 +02:00
parent b624064659
commit 96ecfd8c77
3 changed files with 76 additions and 1 deletions

View File

@@ -2487,6 +2487,24 @@ public:
/**
Constructor.
@param count
Number of the strings in @a labels array.
@param labels
Labels for choices.
@param values
Values for choices. If @NULL, indexes are used. Otherwise must have
at least @a count elements.
@since 3.1.2
*/
wxPGChoices(size_t count, const wxString* labels, const long* values = NULL);
/**
Constructor overload taking wxChar strings.
This constructor is provided mostly for compatibility, prefer to use
one of the other constructor overloads in the new code.
@param labels
Labels for choices, @NULL-terminated.
@@ -2522,6 +2540,24 @@ public:
Adds to current. If did not have own copies, creates them now. If was empty,
identical to set except that creates copies.
@param count
Number of the strings in @a labels array.
@param labels
Labels for choices.
@param values
Values for choices. If @NULL, indexes are used. Otherwise must have
at least @a count elements.
@since 3.1.2
*/
void Add(size_t count, const wxString* labels, const long* values = NULL);
/**
Adds to current.
This overload is provided mostly for compatibility, prefer to use one
of the other ones in the new code.
@param labels
Labels for added choices, @NULL-terminated.
@@ -2532,7 +2568,7 @@ public:
void Add( const wxChar** labels, const long* values = NULL );
/**
Adds to current. Version that works with wxArrayString and wxArrayInt.
@overload
*/
void Add( const wxArrayString& arr, const wxArrayInt& arrint );
@@ -2665,6 +2701,11 @@ public:
This is similar to calling Clear() and the corresponding overload of Add().
*/
void Set(size_t count, const wxString* labels, const long* values = NULL);
/**
@overload
*/
void Set( const wxChar** labels, const long* values = NULL );
/**