X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..8c9f8f91cd62335261ee29762747218f28d129de:/include/wx/generic/choicdgg.h?ds=inline diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index d583b4f489..aab52549dc 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -5,7 +5,7 @@ // 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 ///////////////////////////////////////////////////////////////////////////// @@ -38,7 +38,7 @@ class WXDLLEXPORT wxListBox; class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog { public: - wxAnyChoiceDialog(); + wxAnyChoiceDialog() { } wxAnyChoiceDialog(wxWindow *parent, const wxString& message, @@ -46,7 +46,22 @@ public: int n, const wxString *choices, long styleDlg = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition, - long styleLbox = wxLB_ALWAYS_SB); + long styleLbox = wxLB_ALWAYS_SB) + { + (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, @@ -55,6 +70,13 @@ 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; @@ -69,7 +91,10 @@ protected: class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog { public: - wxSingleChoiceDialog(); + wxSingleChoiceDialog() + { + m_selection = -1; + } wxSingleChoiceDialog(wxWindow *parent, const wxString& message, @@ -79,6 +104,13 @@ public: char **clientData = (char **)NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition); + wxSingleChoiceDialog(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + char **clientData = (char **)NULL, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition); bool Create(wxWindow *parent, const wxString& message, @@ -88,6 +120,13 @@ public: char **clientData = (char **)NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition); + bool Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + char **clientData = (char **)NULL, + long style = wxCHOICEDLG_STYLE, + const wxPoint& pos = wxDefaultPosition); void SetSelection(int sel); int GetSelection() const { return m_selection; } @@ -116,7 +155,7 @@ private: class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog { public: - wxMultiChoiceDialog(); + wxMultiChoiceDialog() { } wxMultiChoiceDialog(wxWindow *parent, const wxString& message, @@ -124,7 +163,19 @@ public: int n, const wxString *choices, long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition) + { + (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, @@ -133,6 +184,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; } @@ -156,9 +213,9 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString& choices, wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -166,9 +223,9 @@ WXDLLEXPORT 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, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -178,9 +235,9 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString& choices, wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -188,9 +245,9 @@ WXDLLEXPORT 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, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -200,8 +257,9 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, const wxArrayString& choices, void **client_data, wxWindow *parent = (wxWindow *) NULL, - int x = -1, int y = -1, - bool centre = TRUE, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -210,8 +268,9 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, int n, const wxString *choices, void **client_data, wxWindow *parent = (wxWindow *) NULL, - int x = -1, int y = -1, - bool centre = TRUE, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -223,9 +282,9 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, const wxString& caption, int n, const wxString *choices, wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -234,9 +293,9 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, const wxString& caption, const wxArrayString& choices, wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);