X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abd9b10e390de62e8b9060ba5ed002c943a67d59..1e6b2edfc836c8867cb868e73d35f36a6e68f943:/include/wx/generic/choicdgg.h?ds=inline diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index c2e3cc51dc..57fc94131f 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__ - -#if defined(__GNUG__) && !defined(__APPLE__) - #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,8 +24,13 @@ class WXDLLEXPORT wxListBox; #define wxCHOICE_HEIGHT 150 #define wxCHOICE_WIDTH 200 +#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 @@ -51,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, @@ -59,9 +71,20 @@ 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); DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog) }; @@ -86,6 +109,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, @@ -95,6 +125,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; } @@ -105,33 +142,21 @@ public: // implementation from now on void OnOK(wxCommandEvent& event); +#ifndef __SMARTPHONE__ void OnListBoxDClick(wxCommandEvent& event); - - // old, deprecated methods -#if 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() }; @@ -154,6 +179,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, @@ -162,6 +196,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; } @@ -170,10 +210,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) }; // ---------------------------------------------------------------------------- @@ -184,20 +230,20 @@ private: 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, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); 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, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -206,20 +252,20 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, 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, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); 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, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, + bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -228,9 +274,10 @@ WXDLLEXPORT 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); @@ -238,9 +285,10 @@ WXDLLEXPORT 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); @@ -251,10 +299,10 @@ WXDLLEXPORT size_t wxGetMultipleChoices(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); @@ -262,52 +310,11 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, const wxArrayString& choices, - wxWindow *parent = (wxWindow *) NULL, - int x = -1, - int y = -1, - bool centre = TRUE, - int width = wxCHOICE_WIDTH, - int height = wxCHOICE_HEIGHT); - -// ---------------------------------------------------------------------------- -// these methods are for backwards compatibility only, not documented and -// deprecated -// ---------------------------------------------------------------------------- - -#if 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, - const wxString& caption, - int n, wxChar **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); - -#endif // WXWIN_COMPATIBILITY_2 - -#endif // __CHOICEDLGH_G__ - +#endif // _WX_GENERIC_CHOICDGG_H_