diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index 02c4ec520b..26cad728cd 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -17,12 +17,14 @@ class WXDLLIMPEXP_FWD_CORE wxListBoxBase; // ---------------------------------------------------------------------------- -// some (ugly...) constants +// some constants // ---------------------------------------------------------------------------- +// These constants are no longer used and only remain here for compatibility. #define wxCHOICE_HEIGHT 150 #define wxCHOICE_WIDTH 200 +// Default style for choice dialogs. #define wxCHOICEDLG_STYLE \ (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxOK | wxCANCEL | wxCENTRE) diff --git a/interface/wx/choicdlg.h b/interface/wx/choicdlg.h index 6f8d9e5b94..8bb71aca5c 100644 --- a/interface/wx/choicdlg.h +++ b/interface/wx/choicdlg.h @@ -5,16 +5,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -/** - Default width of the choice dialog. -*/ -#define wxCHOICE_WIDTH 150 - -/** - Default height of the choice dialog. -*/ -#define wxCHOICE_HEIGHT 200 - /** Default style of the choice dialog. */ @@ -329,6 +319,11 @@ int wxGetSingleChoiceIndex(const wxString& message, If @c centre is @true, the message text (which may include new line characters) is centred; if @false, the message is left-justified. + Note that the @a x, @a y, @a centre, @a width and @a height parameters are + all ignored. To change the dialog's position or size, create a @c + wxSingleChoiceDialog object instead of calling @c wxGetSingleChoice() and + change its size before showing it. + @header{wx/choicdlg.h} @beginWxPerlOnly @@ -381,6 +376,11 @@ wxString wxGetSingleChoice(const wxString& message, if Cancel was pressed. The @c client_data array must have the same number of elements as @c choices or @c aChoices! + Note that the @a x, @a y, @a centre, @a width and @a height parameters are + all ignored. To change the dialog's position or size, create a @c + wxSingleChoiceDialog object instead of calling @c wxGetSingleChoice() and + change its size before showing it. + @header{wx/choicdlg.h} @beginWxPerlOnly @@ -443,8 +443,10 @@ void* wxGetSingleChoiceData(const wxString& message, which is an array of @a n strings for the listbox or by using a single @c aChoices parameter of type wxArrayString. - If @c centre is @true, the message text (which may include new line - characters) is centred; if @false, the message is left-justified. + Note that the @a x, @a y, @a centre, @a width and @a height parameters are + all ignored. To change the dialog's position or size, create a @c + wxSingleChoiceDialog object instead of calling @c wxGetSingleChoice() and + change its size before showing it. @header{wx/choicdlg.h}