X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca65c0440a7163e4e37e48b1c4329709d722db47..64c38b4be828b7b18f7d51f80eb9848f1cccf40e:/include/wx/generic/choicdgg.h diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index 2c9bb01cf6..e2f637305b 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -9,17 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __CHOICEDLGH_G__ -#define __CHOICEDLGH_G__ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #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,14 +24,19 @@ 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 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog +class WXDLLIMPEXP_CORE wxAnyChoiceDialog : public wxDialog { public: wxAnyChoiceDialog() { } @@ -79,7 +80,11 @@ public: 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) }; @@ -88,7 +93,7 @@ protected: // wxSingleChoiceDialog: a dialog with single selection listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog +class WXDLLIMPEXP_CORE wxSingleChoiceDialog : public wxAnyChoiceDialog { public: wxSingleChoiceDialog() @@ -137,12 +142,19 @@ public: // implementation from now on void OnOK(wxCommandEvent& event); +#ifndef __SMARTPHONE__ void OnListBoxDClick(wxCommandEvent& event); +#endif +#ifdef __WXWINCE__ + void OnJoystickButtonDown(wxJoystickEvent& event); +#endif protected: int m_selection; wxString m_stringSelection; + void DoChoice(); + private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog) DECLARE_EVENT_TABLE() @@ -152,7 +164,7 @@ private: // wxMultiChoiceDialog: a dialog with multi selection listbox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog +class WXDLLIMPEXP_CORE wxMultiChoiceDialog : public wxAnyChoiceDialog { public: wxMultiChoiceDialog() { } @@ -198,6 +210,12 @@ 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: @@ -209,67 +227,67 @@ 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 = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + 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, +WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message, const wxString& caption, int n, const wxString *choices, - wxWindow *parent = (wxWindow *) NULL, - int x = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); // 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 = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + 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, +WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, int n, const wxString *choices, - wxWindow *parent = (wxWindow *) NULL, - int x = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + 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, +WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message, const wxString& caption, const wxArrayString& choices, void **client_data, - wxWindow *parent = (wxWindow *) NULL, - int x = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); -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 = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); @@ -277,27 +295,26 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, // 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, +WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, int n, const wxString *choices, - wxWindow *parent = (wxWindow *) NULL, - int x = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + 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 size_t wxGetMultipleChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, const wxArrayString& choices, - wxWindow *parent = (wxWindow *) NULL, - int x = wxDefaultPosition.x, - int y = wxDefaultPosition.y, + wxWindow *parent = NULL, + int x = wxDefaultCoord, + int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT); -#endif // __CHOICEDLGH_G__ - +#endif // _WX_GENERIC_CHOICDGG_H_