Add initial selection parameter to wxGetSingleChoice() functions.

Allow to easily specify the initially selected item.

Closes #11749.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-03-21 11:06:31 +00:00
parent be103d4a3d
commit 697f4a966e
4 changed files with 216 additions and 22 deletions

View File

@@ -316,7 +316,9 @@ int wxGetSingleChoiceIndex(const wxString& message,
int y = -1,
bool centre = true,
int width = 150,
int height = 200);
int height = 200,
int initialSelection = 0);
int wxGetSingleChoiceIndex(const wxString& message,
const wxString& caption,
int n,
@@ -326,8 +328,21 @@ int wxGetSingleChoiceIndex(const wxString& message,
int y = -1,
bool centre = true,
int width = 150,
int height = 200);
int height = 200,
int initialSelection = 0);
int wxGetSingleChoiceIndex(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
int initialSelection,
wxWindow *parent = NULL);
int wxGetSingleChoiceIndex(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
int initialSelection,
wxWindow *parent = NULL);
//@}
/** @addtogroup group_funcmacro_dialog */
@@ -361,7 +376,8 @@ wxString wxGetSingleChoice(const wxString& message,
int y = -1,
bool centre = true,
int width = 150,
int height = 200);
int height = 200
int initialSelection = 0);
wxString wxGetSingleChoice(const wxString& message,
const wxString& caption,
int n,
@@ -371,7 +387,21 @@ wxString wxGetSingleChoice(const wxString& message,
int y = -1,
bool centre = true,
int width = 150,
int height = 200);
int height = 200
int initialSelection = 0);
wxString wxGetSingleChoice(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
int initialSelection,
wxWindow *parent = NULL);
wxString wxGetSingleChoice(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
int initialSelection,
wxWindow *parent = NULL);
//@}
@@ -399,7 +429,9 @@ wxString wxGetSingleChoiceData(const wxString& message,
int y = -1,
bool centre = true,
int width = 150,
int height = 200);
int height = 200
int initialSelection = 0);
wxString wxGetSingleChoiceData(const wxString& message,
const wxString& caption,
int n,
@@ -410,7 +442,22 @@ wxString wxGetSingleChoiceData(const wxString& message,
int y = -1,
bool centre = true,
int width = 150,
int height = 200);
int height = 200
int initialSelection = 0);
void* wxGetSingleChoiceData(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
void **client_data,
int initialSelection,
wxWindow *parent = NULL);
void* wxGetSingleChoiceData(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
void **client_data,
int initialSelection,
wxWindow *parent = NULL);
//@}
@@ -450,6 +497,7 @@ int wxGetSelectedChoices(wxArrayInt& selections,
bool centre = true,
int width = 150,
int height = 200);
int wxGetSelectedChoices(wxArrayInt& selections,
const wxString& message,
const wxString& caption,