projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor corrections to make dist after reports
[wxWidgets.git]
/
include
/
wx
/
generic
/
choicdgg.h
diff --git
a/include/wx/generic/choicdgg.h
b/include/wx/generic/choicdgg.h
index aab52549dcc71e5f31c99e234344b455147390c8..e2f637305b811f86ba5f0221040648ca5e34b35a 100644
(file)
--- a/
include/wx/generic/choicdgg.h
+++ b/
include/wx/generic/choicdgg.h
@@
-9,17
+9,13
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// 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"
#include "wx/dynarray.h"
#include "wx/dialog.h"
-class WXDLL
EXPORT wxListBox
;
+class WXDLL
IMPEXP_FWD_CORE wxListBoxBase
;
// ----------------------------------------------------------------------------
// some (ugly...) constants
// ----------------------------------------------------------------------------
// some (ugly...) constants
@@
-28,14
+24,19
@@
class WXDLLEXPORT wxListBox;
#define wxCHOICE_HEIGHT 150
#define wxCHOICE_WIDTH 200
#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)
#define wxCHOICEDLG_STYLE \
(wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxOK | wxCANCEL | wxCENTRE)
+#endif
// ----------------------------------------------------------------------------
// wxAnyChoiceDialog: a base class for dialogs containing a listbox
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxAnyChoiceDialog: a base class for dialogs containing a listbox
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxAnyChoiceDialog : public wxDialog
+class WXDLL
IMPEXP_CORE
wxAnyChoiceDialog : public wxDialog
{
public:
wxAnyChoiceDialog() { }
{
public:
wxAnyChoiceDialog() { }
@@
-79,7
+80,11
@@
public:
long styleLbox = wxLB_ALWAYS_SB);
protected:
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)
};
DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
};
@@
-88,7
+93,7
@@
protected:
// wxSingleChoiceDialog: a dialog with single selection listbox
// ----------------------------------------------------------------------------
// wxSingleChoiceDialog: a dialog with single selection listbox
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxSingleChoiceDialog : public wxAnyChoiceDialog
+class WXDLL
IMPEXP_CORE
wxSingleChoiceDialog : public wxAnyChoiceDialog
{
public:
wxSingleChoiceDialog()
{
public:
wxSingleChoiceDialog()
@@
-137,12
+142,19
@@
public:
// implementation from now on
void OnOK(wxCommandEvent& event);
// implementation from now on
void OnOK(wxCommandEvent& event);
+#ifndef __SMARTPHONE__
void OnListBoxDClick(wxCommandEvent& event);
void OnListBoxDClick(wxCommandEvent& event);
+#endif
+#ifdef __WXWINCE__
+ void OnJoystickButtonDown(wxJoystickEvent& event);
+#endif
protected:
int m_selection;
wxString m_stringSelection;
protected:
int m_selection;
wxString m_stringSelection;
+ void DoChoice();
+
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog)
DECLARE_EVENT_TABLE()
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog)
DECLARE_EVENT_TABLE()
@@
-152,7
+164,7
@@
private:
// wxMultiChoiceDialog: a dialog with multi selection listbox
// ----------------------------------------------------------------------------
// wxMultiChoiceDialog: a dialog with multi selection listbox
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxMultiChoiceDialog : public wxAnyChoiceDialog
+class WXDLL
IMPEXP_CORE
wxMultiChoiceDialog : public wxAnyChoiceDialog
{
public:
wxMultiChoiceDialog() { }
{
public:
wxMultiChoiceDialog() { }
@@
-198,6
+210,12
@@
public:
virtual bool TransferDataFromWindow();
protected:
virtual bool TransferDataFromWindow();
protected:
+#if wxUSE_CHECKLISTBOX
+ virtual wxListBoxBase *CreateList(int n,
+ const wxString *choices,
+ long styleLbox);
+#endif // wxUSE_CHECKLISTBOX
+
wxArrayInt m_selections;
private:
wxArrayInt m_selections;
private:
@@
-209,20
+227,20
@@
private:
// ----------------------------------------------------------------------------
// get the user selection as a string
// ----------------------------------------------------------------------------
// get the user selection as a string
-WXDLL
EXPORT
wxString wxGetSingleChoice(const wxString& message,
+WXDLL
IMPEXP_CORE
wxString wxGetSingleChoice(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
const wxString& caption,
const wxArrayString& choices,
- wxWindow *parent =
(wxWindow *)
NULL,
+ wxWindow *parent = NULL,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
-WXDLL
EXPORT
wxString wxGetSingleChoice(const wxString& message,
+WXDLL
IMPEXP_CORE
wxString wxGetSingleChoice(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
const wxString& caption,
int n, const wxString *choices,
- wxWindow *parent =
(wxWindow *)
NULL,
+ wxWindow *parent = NULL,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
@@
-231,20
+249,20
@@
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
// Same as above but gets position in list of strings, instead of string,
// or -1 if no selection
// Same as above but gets position in list of strings, instead of string,
// or -1 if no selection
-WXDLL
EXPORT
int wxGetSingleChoiceIndex(const wxString& message,
+WXDLL
IMPEXP_CORE
int wxGetSingleChoiceIndex(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
const wxString& caption,
const wxArrayString& choices,
- wxWindow *parent =
(wxWindow *)
NULL,
+ wxWindow *parent = NULL,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
-WXDLL
EXPORT
int wxGetSingleChoiceIndex(const wxString& message,
+WXDLL
IMPEXP_CORE
int wxGetSingleChoiceIndex(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
const wxString& caption,
int n, const wxString *choices,
- wxWindow *parent =
(wxWindow *)
NULL,
+ wxWindow *parent = NULL,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
@@
-252,22
+270,22
@@
WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
int height = wxCHOICE_HEIGHT);
// Return client data instead or NULL if cancelled
int height = wxCHOICE_HEIGHT);
// Return client data instead or NULL if cancelled
-WXDLL
EXPORT
void* wxGetSingleChoiceData(const wxString& message,
+WXDLL
IMPEXP_CORE
void* wxGetSingleChoiceData(const wxString& message,
const wxString& caption,
const wxArrayString& choices,
void **client_data,
const wxString& caption,
const wxArrayString& choices,
void **client_data,
- wxWindow *parent =
(wxWindow *)
NULL,
+ wxWindow *parent = NULL,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
-WXDLL
EXPORT
void* wxGetSingleChoiceData(const wxString& message,
+WXDLL
IMPEXP_CORE
void* wxGetSingleChoiceData(const wxString& message,
const wxString& caption,
int n, const wxString *choices,
void **client_data,
const wxString& caption,
int n, const wxString *choices,
void **client_data,
- wxWindow *parent =
(wxWindow *)
NULL,
+ wxWindow *parent = NULL,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
@@
-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
// 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
-WXDLL
EXPORT
size_t wxGetMultipleChoices(wxArrayInt& selections,
+WXDLL
IMPEXP_CORE
size_t wxGetMultipleChoices(wxArrayInt& selections,
const wxString& message,
const wxString& caption,
int n, const wxString *choices,
const wxString& message,
const wxString& caption,
int n, const wxString *choices,
- wxWindow *parent =
(wxWindow *)
NULL,
+ wxWindow *parent = NULL,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
-WXDLL
EXPORT
size_t wxGetMultipleChoices(wxArrayInt& selections,
+WXDLL
IMPEXP_CORE
size_t wxGetMultipleChoices(wxArrayInt& selections,
const wxString& message,
const wxString& caption,
const wxArrayString& choices,
const wxString& message,
const wxString& caption,
const wxArrayString& choices,
- wxWindow *parent =
(wxWindow *)
NULL,
+ wxWindow *parent = NULL,
int x = wxDefaultCoord,
int y = wxDefaultCoord,
bool centre = true,
int width = wxCHOICE_WIDTH,
int height = wxCHOICE_HEIGHT);
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_