added missing function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -194,7 +194,8 @@ void *wxGetSingleChoiceData( const wxString& message,
|
|||||||
bool WXUNUSED(centre),
|
bool WXUNUSED(centre),
|
||||||
int WXUNUSED(width), int WXUNUSED(height) )
|
int WXUNUSED(width), int WXUNUSED(height) )
|
||||||
{
|
{
|
||||||
wxSingleChoiceDialog dialog(parent, message, caption, n, choices, (char **)client_data);
|
wxSingleChoiceDialog dialog(parent, message, caption, n, choices,
|
||||||
|
(char **)client_data);
|
||||||
void *data;
|
void *data;
|
||||||
if ( dialog.ShowModal() == wxID_OK )
|
if ( dialog.ShowModal() == wxID_OK )
|
||||||
data = dialog.GetSelectionClientData();
|
data = dialog.GetSelectionClientData();
|
||||||
@@ -204,6 +205,25 @@ void *wxGetSingleChoiceData( const wxString& message,
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void *wxGetSingleChoiceData( const wxString& message,
|
||||||
|
const wxString& caption,
|
||||||
|
const wxArrayString& aChoices,
|
||||||
|
void **client_data,
|
||||||
|
wxWindow *parent,
|
||||||
|
int x, int y,
|
||||||
|
bool centre,
|
||||||
|
int width, int height)
|
||||||
|
{
|
||||||
|
wxString *choices;
|
||||||
|
int n = ConvertWXArrayToC(aChoices, &choices);
|
||||||
|
void *res = wxGetSingleChoiceData(message, caption, n, choices,
|
||||||
|
client_data, parent,
|
||||||
|
x, y, centre, width, height);
|
||||||
|
delete [] choices;
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef WXWIN_COMPATIBILITY_2
|
#ifdef WXWIN_COMPATIBILITY_2
|
||||||
// Overloaded for backward compatibility
|
// Overloaded for backward compatibility
|
||||||
void *wxGetSingleChoiceData( const wxString& message,
|
void *wxGetSingleChoiceData( const wxString& message,
|
||||||
|
Reference in New Issue
Block a user