X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96bcf4f9cc8401fc499215bbe9181c351cc42d43..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/generic/choicdgg.h?ds=sidebyside diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index fcd13f46bd..39ac21ef33 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -5,21 +5,17 @@ // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __CHOICEDLGH_G__ -#define __CHOICEDLGH_G__ - -#ifdef __GNUG__ - #pragma interface "choicdgg.h" -#endif +#ifndef _WX_GENERIC_CHOICDGG_H_ +#define _WX_GENERIC_CHOICDGG_H_ #include "wx/dynarray.h" #include "wx/dialog.h" -class WXDLLEXPORT wxListBox; +class WXDLLIMPEXP_FWD_CORE wxListBoxBase; // ---------------------------------------------------------------------------- // some (ugly...) constants @@ -28,13 +24,19 @@ class WXDLLEXPORT wxListBox; #define wxCHOICE_HEIGHT 150 #define wxCHOICE_WIDTH 200 -#define wxCHOICEDLG_STYLE (wxDEFAULT_DIALOG_STYLE|wxOK | wxCANCEL | wxCENTRE) +#ifdef __WXWINCE__ +#define wxCHOICEDLG_STYLE \ + (wxDEFAULT_DIALOG_STYLE | wxOK | wxCANCEL | wxCENTRE) +#else +#define wxCHOICEDLG_STYLE \ + (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxOK | wxCANCEL | wxCENTRE) +#endif // ---------------------------------------------------------------------------- // wxAnyChoiceDialog: a base class for dialogs containing a listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog +class WXDLLIMPEXP_CORE wxAnyChoiceDialog : public wxDialog { public: wxAnyChoiceDialog() { } @@ -50,6 +52,17 @@ public: (void)Create(parent, message, caption, n, choices, styleDlg, pos, styleLbox); } + wxAnyChoiceDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + long styleDlg = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition, + long styleLbox = wxLB_ALWAYS_SB) + { + (void)Create(parent, message, caption, choices, + styleDlg, pos, styleLbox); + } bool Create(wxWindow *parent, const wxString& message, @@ -58,16 +71,29 @@ public: long styleDlg = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition, long styleLbox = wxLB_ALWAYS_SB); + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + long styleDlg = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition, + long styleLbox = wxLB_ALWAYS_SB); protected: - wxListBox *m_listbox; + wxListBoxBase *m_listbox; + + virtual wxListBoxBase *CreateList(int n, + const wxString *choices, + long styleLbox); + + wxDECLARE_NO_COPY_CLASS(wxAnyChoiceDialog); }; // ---------------------------------------------------------------------------- // wxSingleChoiceDialog: a dialog with single selection listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog +class WXDLLIMPEXP_CORE wxSingleChoiceDialog : public wxAnyChoiceDialog { public: wxSingleChoiceDialog() @@ -80,55 +106,130 @@ public: const wxString& caption, int n, const wxString *choices, - char **clientData = (char **)NULL, + void **clientData = NULL, long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition) + { + Create(parent, message, caption, n, choices, clientData, style, pos); + } + + wxSingleChoiceDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + void **clientData = NULL, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition) + { + Create(parent, message, caption, choices, clientData, style, pos); + } bool Create(wxWindow *parent, const wxString& message, const wxString& caption, int n, const wxString *choices, - char **clientData = (char **)NULL, + void **clientData = NULL, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition); + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + void **clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition); void SetSelection(int sel); int GetSelection() const { return m_selection; } wxString GetStringSelection() const { return m_stringSelection; } + void* GetSelectionData() const { return m_clientData; } + +#if WXWIN_COMPATIBILITY_2_8 + // Deprecated overloads taking "char**" client data. + wxDEPRECATED_CONSTRUCTOR + ( + wxSingleChoiceDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + int n, + const wxString *choices, + char **clientData, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition) + ) + { + Create(parent, message, caption, n, choices, + (void**)clientData, style, pos); + } + + wxDEPRECATED_CONSTRUCTOR + ( + wxSingleChoiceDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + char **clientData, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition) + ) + { + Create(parent, message, caption, choices, + (void**)clientData, style, pos); + } - // obsolete function (NB: no need to make it return wxChar, it's untyped) - char *GetSelectionClientData() const { return (char *)m_clientData; } + wxDEPRECATED_INLINE + ( + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + int n, + const wxString *choices, + char **clientData, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition), + return Create(parent, message, caption, n, choices, + (void**)clientData, style, pos); + ) + + wxDEPRECATED_INLINE + ( + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + char **clientData, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition), + return Create(parent, message, caption, choices, + (void**)clientData, style, pos); + ) + + // NB: no need to make it return wxChar, it's untyped + wxDEPRECATED_ACCESSOR + ( + char* GetSelectionClientData() const, + (char*)GetSelectionData() + ) +#endif // WXWIN_COMPATIBILITY_2_8 // implementation from now on void OnOK(wxCommandEvent& event); +#ifndef __SMARTPHONE__ void OnListBoxDClick(wxCommandEvent& event); - - // old, deprecated methods -#ifdef WXWIN_COMPATIBILITY_2 - wxSingleChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxStringList& choices, - char **clientData = (char **)NULL, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); - - bool Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxStringList& choices, - char **clientData = (char **)NULL, - long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); -#endif // WXWIN_COMPATIBILITY_2 +#endif +#ifdef __WXWINCE__ + void OnJoystickButtonDown(wxJoystickEvent& event); +#endif protected: int m_selection; wxString m_stringSelection; + void DoChoice(); + private: - DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog) DECLARE_EVENT_TABLE() }; @@ -136,7 +237,7 @@ private: // wxMultiChoiceDialog: a dialog with multi selection listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog +class WXDLLIMPEXP_CORE wxMultiChoiceDialog : public wxAnyChoiceDialog { public: wxMultiChoiceDialog() { } @@ -151,6 +252,15 @@ public: { (void)Create(parent, message, caption, n, choices, style, pos); } + wxMultiChoiceDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition) + { + (void)Create(parent, message, caption, choices, style, pos); + } bool Create(wxWindow *parent, const wxString& message, @@ -159,6 +269,12 @@ public: const wxString *choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition); + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition); void SetSelections(const wxArrayInt& selections); wxArrayInt GetSelections() const { return m_selections; } @@ -167,10 +283,16 @@ public: virtual bool TransferDataFromWindow(); protected: +#if wxUSE_CHECKLISTBOX + virtual wxListBoxBase *CreateList(int n, + const wxString *choices, + long styleLbox); +#endif // wxUSE_CHECKLISTBOX + wxArrayInt m_selections; private: - DECLARE_DYNAMIC_CLASS(wxMultiChoiceDialog) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMultiChoiceDialog) }; // ---------------------------------------------------------------------------- @@ -178,133 +300,166 @@ private: // ---------------------------------------------------------------------------- // get the user selection as a string -WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, +WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString& choices, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); + int height = wxCHOICE_HEIGHT, + int initialSelection = 0); -WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, +WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, const wxString& caption, int n, const wxString *choices, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); + int height = wxCHOICE_HEIGHT, + int initialSelection = 0); + +WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, + const wxString& caption, + const wxArrayString& choices, + int initialSelection, + wxWindow *parent = NULL); + +WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, + const wxString& caption, + int n, const wxString *choices, + int initialSelection, + wxWindow *parent = NULL); // Same as above but gets position in list of strings, instead of string, // or -1 if no selection -WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, +WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString& choices, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); + int height = wxCHOICE_HEIGHT, + int initialSelection = 0); -WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, +WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, int n, const wxString *choices, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); - -// Return client data instead or NULL if cancelled -WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, + int height = wxCHOICE_HEIGHT, + int initialSelection = 0); + +WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, + const wxString& caption, + const wxArrayString& choices, + int initialSelection, + wxWindow *parent = NULL); + +WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, + const wxString& caption, + int n, const wxString *choices, + int initialSelection, + wxWindow *parent = NULL); + +// Return client data instead or NULL if canceled +WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, const wxString& caption, const wxArrayString& choices, void **client_data, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, int y = -1, - bool centre = TRUE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); + int height = wxCHOICE_HEIGHT, + int initialSelection = 0); -WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, +WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, const wxString& caption, int n, const wxString *choices, void **client_data, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, int y = -1, - bool centre = TRUE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); + int height = wxCHOICE_HEIGHT, + int initialSelection = 0); + +WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, + const wxString& caption, + const wxArrayString& choices, + void **client_data, + int initialSelection, + wxWindow *parent = NULL); + + +WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, + const wxString& caption, + int n, const wxString *choices, + void **client_data, + int initialSelection, + wxWindow *parent = NULL); // fill the array with the indices of the chosen items, it will be empty // if no items were selected or Cancel was pressed - return the number of -// selections -WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, +// selections or -1 if cancelled +WXDLLIMPEXP_CORE int wxGetSelectedChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, int n, const wxString *choices, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); -WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, +WXDLLIMPEXP_CORE int wxGetSelectedChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, const wxArrayString& choices, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); -// ---------------------------------------------------------------------------- -// these methods are for backwards compatibility only, not documented and -// deprecated -// ---------------------------------------------------------------------------- - -#ifdef WXWIN_COMPATIBILITY_2 - -WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, - const wxString& caption, - int n, wxChar *choices[], - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); - -WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, - const wxString& caption, - int n, wxChar *choices[], - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); - -WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, +#if WXWIN_COMPATIBILITY_2_8 +// fill the array with the indices of the chosen items, it will be empty +// if no items were selected or Cancel was pressed - return the number of +// selections +wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections, + const wxString& message, const wxString& caption, - int n, wxChar **choices, - void **client_data, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, int y = -1, - bool centre = TRUE, + int n, const wxString *choices, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); + int height = wxCHOICE_HEIGHT) ); +wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, + int width = wxCHOICE_WIDTH, + int height = wxCHOICE_HEIGHT)); +#endif // WXWIN_COMPATIBILITY_2_8 -#endif // WXWIN_COMPATIBILITY_2 - -#endif // __CHOICEDLGH_G__ - +#endif // _WX_GENERIC_CHOICDGG_H_