Added some missing STL-like wxArray/wxArrayString constructors.
Added helper class wxCArrayString, better replacement for wxArrayString::GetStringArray. Added overloaded constructors and Create() methods taking a wxArrayString for wxCheckListBox, wxChoice, wxComboBox, wxListBox, wxRadioBox, wxSingleChoiceDialog, wxMultipleChoiceDialog. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
55945915c9
commit
584ad2a32f
@ -51,7 +51,8 @@ versions, please update your code to not use them.
|
|||||||
- wxTheFontMapper: use wxFontMapper::Get() instead
|
- wxTheFontMapper: use wxFontMapper::Get() instead
|
||||||
- wxStringHashTable: use wxHashMap instead
|
- wxStringHashTable: use wxHashMap instead
|
||||||
- wxHashTableLong: use wxHashMap instead
|
- wxHashTableLong: use wxHashMap instead
|
||||||
- wxArrayString::GetStringArray: no replacement
|
- wxArrayString::GetStringArray: use wxCArrayString or alternative wxWindows
|
||||||
|
methods taking wxArrayString
|
||||||
- wxArrayString::Remove(index, count): use RemoveAt instead
|
- wxArrayString::Remove(index, count): use RemoveAt instead
|
||||||
- wxTreeItemId conversion to long is deprecated and shouldn't be used
|
- wxTreeItemId conversion to long is deprecated and shouldn't be used
|
||||||
- [MSW only] wxWindow::GetUseCtl3D(), GetTransparentBackground() and
|
- [MSW only] wxWindow::GetUseCtl3D(), GetTransparentBackground() and
|
||||||
@ -91,6 +92,9 @@ All:
|
|||||||
wxSize (Wlodzimierz Skiba)
|
wxSize (Wlodzimierz Skiba)
|
||||||
- intermediate wxIPaddress class added to prepare for
|
- intermediate wxIPaddress class added to prepare for
|
||||||
wxIPV6address (Ray Gilbert)
|
wxIPV6address (Ray Gilbert)
|
||||||
|
- added overloaded constructors and Create() methods taking wxArrayString
|
||||||
|
for wxChoice, wxComboBox, wxListBox, wxRadioBox, wxCheckListBox,
|
||||||
|
wxSingleChoiceDialog, wxMultipleChoiceDialog
|
||||||
|
|
||||||
All (GUI):
|
All (GUI):
|
||||||
|
|
||||||
|
@ -92,10 +92,8 @@ public:
|
|||||||
|
|
||||||
// constructors and destructor
|
// constructors and destructor
|
||||||
// default ctor
|
// default ctor
|
||||||
wxArrayString()
|
wxArrayString() { Init(false); }
|
||||||
: m_nSize(0), m_nCount(0), m_pItems(NULL), m_autoSort(FALSE)
|
// if autoSort is true, the array is always sorted (in alphabetical order)
|
||||||
{ Init(FALSE); }
|
|
||||||
// if autoSort is TRUE, the array is always sorted (in alphabetical order)
|
|
||||||
//
|
//
|
||||||
// NB: the reason for using int and not bool is that like this we can avoid
|
// NB: the reason for using int and not bool is that like this we can avoid
|
||||||
// using this ctor for implicit conversions from "const char *" (which
|
// using this ctor for implicit conversions from "const char *" (which
|
||||||
@ -103,9 +101,7 @@ public:
|
|||||||
//
|
//
|
||||||
// of course, using explicit would be even better - if all compilers
|
// of course, using explicit would be even better - if all compilers
|
||||||
// supported it...
|
// supported it...
|
||||||
wxArrayString(int autoSort)
|
wxArrayString(int autoSort) { Init(autoSort != 0); }
|
||||||
: m_nSize(0), m_nCount(0), m_pItems(NULL), m_autoSort(FALSE)
|
|
||||||
{ Init(autoSort != 0); }
|
|
||||||
// copy ctor
|
// copy ctor
|
||||||
wxArrayString(const wxArrayString& array);
|
wxArrayString(const wxArrayString& array);
|
||||||
// assignment operator
|
// assignment operator
|
||||||
@ -155,14 +151,16 @@ public:
|
|||||||
// take one in their ctor. You must delete[] it yourself
|
// take one in their ctor. You must delete[] it yourself
|
||||||
// once you are done with it. Will return NULL if the
|
// once you are done with it. Will return NULL if the
|
||||||
// ArrayString was empty.
|
// ArrayString was empty.
|
||||||
|
#if WXWIN_COMPATIBILITY_2_4
|
||||||
wxString* GetStringArray() const;
|
wxString* GetStringArray() const;
|
||||||
|
#endif
|
||||||
|
|
||||||
// item management
|
// item management
|
||||||
// Search the element in the array, starting from the beginning if
|
// Search the element in the array, starting from the beginning if
|
||||||
// bFromEnd is FALSE or from end otherwise. If bCase, comparison is case
|
// bFromEnd is false or from end otherwise. If bCase, comparison is case
|
||||||
// sensitive (default). Returns index of the first item matched or
|
// sensitive (default). Returns index of the first item matched or
|
||||||
// wxNOT_FOUND
|
// wxNOT_FOUND
|
||||||
int Index (const wxChar *sz, bool bCase = TRUE, bool bFromEnd = FALSE) const;
|
int Index (const wxChar *sz, bool bCase = true, bool bFromEnd = false) const;
|
||||||
// add new element at the end (if the array is not sorted), return its
|
// add new element at the end (if the array is not sorted), return its
|
||||||
// index
|
// index
|
||||||
size_t Add(const wxString& str, size_t nInsert = 1);
|
size_t Add(const wxString& str, size_t nInsert = 1);
|
||||||
@ -180,8 +178,8 @@ public:
|
|||||||
|
|
||||||
// sorting
|
// sorting
|
||||||
// sort array elements in alphabetical order (or reversed alphabetical
|
// sort array elements in alphabetical order (or reversed alphabetical
|
||||||
// order if reverseOrder parameter is TRUE)
|
// order if reverseOrder parameter is true)
|
||||||
void Sort(bool reverseOrder = FALSE);
|
void Sort(bool reverseOrder = false);
|
||||||
// sort array elements using specified comparaison function
|
// sort array elements using specified comparaison function
|
||||||
void Sort(CompareFunction compareFunction);
|
void Sort(CompareFunction compareFunction);
|
||||||
void Sort(CompareFunction2 compareFunction);
|
void Sort(CompareFunction2 compareFunction);
|
||||||
@ -257,6 +255,9 @@ public:
|
|||||||
bool operator !=(const itor& it) { return m_ptr != it.m_ptr; }
|
bool operator !=(const itor& it) { return m_ptr != it.m_ptr; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
wxArrayString(const_iterator first, const_iterator last)
|
||||||
|
{ Init(false); assign(first, last); }
|
||||||
|
wxArrayString(size_type n, const_reference v) { Init(false); assign(n, v); }
|
||||||
void assign(const_iterator first, const_iterator last);
|
void assign(const_iterator first, const_iterator last);
|
||||||
void assign(size_type n, const_reference v)
|
void assign(size_type n, const_reference v)
|
||||||
{ clear(); Add(v, n); }
|
{ clear(); Add(v, n); }
|
||||||
@ -309,18 +310,43 @@ private:
|
|||||||
|
|
||||||
wxChar **m_pItems; // pointer to data
|
wxChar **m_pItems; // pointer to data
|
||||||
|
|
||||||
bool m_autoSort; // if TRUE, keep the array always sorted
|
bool m_autoSort; // if true, keep the array always sorted
|
||||||
};
|
};
|
||||||
|
|
||||||
class WXDLLIMPEXP_BASE wxSortedArrayString : public wxArrayString
|
class WXDLLIMPEXP_BASE wxSortedArrayString : public wxArrayString
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxSortedArrayString() : wxArrayString(TRUE)
|
wxSortedArrayString() : wxArrayString(true)
|
||||||
{ }
|
{ }
|
||||||
wxSortedArrayString(const wxArrayString& array) : wxArrayString(TRUE)
|
wxSortedArrayString(const wxArrayString& array) : wxArrayString(true)
|
||||||
{ Copy(array); }
|
{ Copy(array); }
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // !wxUSE_STL
|
#endif // !wxUSE_STL
|
||||||
|
|
||||||
|
// this class provides a temporary wxString* from a
|
||||||
|
// wxArrayString
|
||||||
|
class WXDLLIMPEXP_BASE wxCArrayString
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
wxCArrayString( const wxArrayString& array )
|
||||||
|
: m_array( array ), m_strings( NULL )
|
||||||
|
{ }
|
||||||
|
~wxCArrayString() { delete[] m_strings; }
|
||||||
|
|
||||||
|
size_t GetCount() const { return m_array.GetCount(); }
|
||||||
|
wxString* GetStrings()
|
||||||
|
{
|
||||||
|
if( m_strings ) return m_strings;
|
||||||
|
size_t count = m_array.GetCount();
|
||||||
|
m_strings = new wxString[count];
|
||||||
|
for( size_t i = 0; i < count; ++i )
|
||||||
|
m_strings[i] = m_array[i];
|
||||||
|
return m_strings;
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
const wxArrayString& m_array;
|
||||||
|
wxString* m_strings;
|
||||||
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -37,6 +37,16 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, winid, pos, size, n, choices, style, validator, name);
|
Create(parent, winid, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxCheckListBox(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, winid, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID winid,
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -45,6 +55,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
virtual ~wxCheckListBox();
|
virtual ~wxCheckListBox();
|
||||||
|
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
|
@ -15,6 +15,8 @@
|
|||||||
//#include "wx/cocoa/NSPopUpButton.h"
|
//#include "wx/cocoa/NSPopUpButton.h"
|
||||||
#include "wx/cocoa/NSMenu.h"
|
#include "wx/cocoa/NSMenu.h"
|
||||||
|
|
||||||
|
class WXDLLIMPEXP_BASE wxSortedArrayString;
|
||||||
|
|
||||||
// ========================================================================
|
// ========================================================================
|
||||||
// wxChoice
|
// wxChoice
|
||||||
// ========================================================================
|
// ========================================================================
|
||||||
@ -39,6 +41,17 @@ public:
|
|||||||
Init();
|
Init();
|
||||||
Create(parent, winid, pos, size, n, choices, style, validator, name);
|
Create(parent, winid, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxChoice(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
Create(parent, winid, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID winid,
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -47,6 +60,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr);
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr);
|
||||||
virtual ~wxChoice();
|
virtual ~wxChoice();
|
||||||
protected:
|
protected:
|
||||||
void Init();
|
void Init();
|
||||||
|
@ -40,6 +40,18 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, winid, value, pos, size, n, choices, style, validator, name);
|
Create(parent, winid, value, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxComboBox(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, winid, value, pos, size, choices, style,
|
||||||
|
validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID winid,
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxString& value = wxEmptyString,
|
const wxString& value = wxEmptyString,
|
||||||
@ -49,6 +61,14 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxComboBoxNameStr);
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr);
|
||||||
virtual ~wxComboBox();
|
virtual ~wxComboBox();
|
||||||
|
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
|
@ -39,6 +39,16 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, winid, pos, size, n, choices, style, validator, name);
|
Create(parent, winid, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxListBox(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, winid, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID winid,
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -47,6 +57,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
virtual ~wxListBox();
|
virtual ~wxListBox();
|
||||||
|
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
|
@ -38,6 +38,17 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, winid, title, pos, size, n, choices, majorDim, style, validator, name);
|
Create(parent, winid, title, pos, size, n, choices, majorDim, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxRadioBox(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0,
|
||||||
|
long style = 0, const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, winid, title, pos, size, choices, majorDim, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID winid,
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxString& title,
|
const wxString& title,
|
||||||
@ -48,6 +59,15 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxRadioBoxNameStr);
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
virtual ~wxRadioBox();
|
virtual ~wxRadioBox();
|
||||||
|
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
|
@ -442,6 +442,9 @@ public: \
|
|||||||
bool operator !=(const itor& it) { return m_ptr != it.m_ptr; } \
|
bool operator !=(const itor& it) { return m_ptr != it.m_ptr; } \
|
||||||
}; \
|
}; \
|
||||||
\
|
\
|
||||||
|
name(size_type n, const_reference v) { assign(n, v); } \
|
||||||
|
name(const_iterator first, const_iterator last) \
|
||||||
|
{ assign(first, last); } \
|
||||||
void assign(const_iterator first, const_iterator last) \
|
void assign(const_iterator first, const_iterator last) \
|
||||||
{ base::assign((bconst_iterator)first, (bconst_iterator)last); } \
|
{ base::assign((bconst_iterator)first, (bconst_iterator)last); } \
|
||||||
void assign(size_type n, const_reference v) \
|
void assign(size_type n, const_reference v) \
|
||||||
|
@ -51,6 +51,17 @@ public:
|
|||||||
(void)Create(parent, message, caption, n, choices,
|
(void)Create(parent, message, caption, n, choices,
|
||||||
styleDlg, pos, styleLbox);
|
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,
|
bool Create(wxWindow *parent,
|
||||||
const wxString& message,
|
const wxString& message,
|
||||||
@ -59,6 +70,13 @@ public:
|
|||||||
long styleDlg = wxCHOICEDLG_STYLE,
|
long styleDlg = wxCHOICEDLG_STYLE,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
long styleLbox = wxLB_ALWAYS_SB);
|
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:
|
protected:
|
||||||
wxListBox *m_listbox;
|
wxListBox *m_listbox;
|
||||||
@ -86,6 +104,13 @@ public:
|
|||||||
char **clientData = (char **)NULL,
|
char **clientData = (char **)NULL,
|
||||||
long style = wxCHOICEDLG_STYLE,
|
long style = wxCHOICEDLG_STYLE,
|
||||||
const wxPoint& pos = wxDefaultPosition);
|
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,
|
bool Create(wxWindow *parent,
|
||||||
const wxString& message,
|
const wxString& message,
|
||||||
@ -95,6 +120,13 @@ public:
|
|||||||
char **clientData = (char **)NULL,
|
char **clientData = (char **)NULL,
|
||||||
long style = wxCHOICEDLG_STYLE,
|
long style = wxCHOICEDLG_STYLE,
|
||||||
const wxPoint& pos = wxDefaultPosition);
|
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);
|
void SetSelection(int sel);
|
||||||
int GetSelection() const { return m_selection; }
|
int GetSelection() const { return m_selection; }
|
||||||
@ -135,6 +167,15 @@ public:
|
|||||||
{
|
{
|
||||||
(void)Create(parent, message, caption, n, choices, style, pos);
|
(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,
|
bool Create(wxWindow *parent,
|
||||||
const wxString& message,
|
const wxString& message,
|
||||||
@ -143,6 +184,12 @@ public:
|
|||||||
const wxString *choices,
|
const wxString *choices,
|
||||||
long style = wxCHOICEDLG_STYLE,
|
long style = wxCHOICEDLG_STYLE,
|
||||||
const wxPoint& pos = wxDefaultPosition);
|
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);
|
void SetSelections(const wxArrayInt& selections);
|
||||||
wxArrayInt GetSelections() const { return m_selections; }
|
wxArrayInt GetSelections() const { return m_selections; }
|
||||||
|
@ -44,6 +44,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
bool IsChecked( int index ) const;
|
bool IsChecked( int index ) const;
|
||||||
void Check( int index, bool check = TRUE );
|
void Check( int index, bool check = TRUE );
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
class WXDLLIMPEXP_BASE wxSortedArrayString;
|
class WXDLLIMPEXP_BASE wxSortedArrayString;
|
||||||
|
class WXDLLIMPEXP_BASE wxArrayString;
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// wxChoice
|
// wxChoice
|
||||||
@ -36,6 +37,18 @@ public:
|
|||||||
|
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxChoice( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr )
|
||||||
|
{
|
||||||
|
m_strings = (wxSortedArrayString *)NULL;
|
||||||
|
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
~wxChoice();
|
~wxChoice();
|
||||||
bool Create( wxWindow *parent, wxWindowID id,
|
bool Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -44,6 +57,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr );
|
const wxString& name = wxChoiceNameStr );
|
||||||
|
bool Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr );
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
void Delete(int n);
|
void Delete(int n);
|
||||||
|
@ -54,6 +54,17 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
inline wxComboBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, value, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
~wxComboBox();
|
~wxComboBox();
|
||||||
|
|
||||||
@ -65,6 +76,14 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxComboBoxNameStr);
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
|
||||||
void Clear();
|
void Clear();
|
||||||
void Delete( int n );
|
void Delete( int n );
|
||||||
|
@ -41,6 +41,19 @@ public:
|
|||||||
#endif // wxUSE_CHECKLISTBOX
|
#endif // wxUSE_CHECKLISTBOX
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxListBox( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr )
|
||||||
|
{
|
||||||
|
#if wxUSE_CHECKLISTBOX
|
||||||
|
m_hasCheckBoxes = FALSE;
|
||||||
|
#endif // wxUSE_CHECKLISTBOX
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
virtual ~wxListBox();
|
virtual ~wxListBox();
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
@ -50,6 +63,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual void Clear();
|
virtual void Clear();
|
||||||
|
@ -41,6 +41,21 @@ public:
|
|||||||
|
|
||||||
Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
|
Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
|
||||||
}
|
}
|
||||||
|
wxRadioBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 1,
|
||||||
|
long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
|
||||||
|
Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
|
||||||
|
}
|
||||||
|
|
||||||
virtual ~wxRadioBox();
|
virtual ~wxRadioBox();
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
@ -54,6 +69,16 @@ public:
|
|||||||
long style = wxRA_HORIZONTAL,
|
long style = wxRA_HORIZONTAL,
|
||||||
const wxValidator& val = wxDefaultValidator,
|
const wxValidator& val = wxDefaultValidator,
|
||||||
const wxString& name = wxRadioBoxNameStr);
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0,
|
||||||
|
long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
|
||||||
int FindString( const wxString& s) const;
|
int FindString( const wxString& s) const;
|
||||||
void SetSelection( int n );
|
void SetSelection( int n );
|
||||||
|
@ -44,6 +44,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
bool IsChecked( int index ) const;
|
bool IsChecked( int index ) const;
|
||||||
void Check( int index, bool check = TRUE );
|
void Check( int index, bool check = TRUE );
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
class WXDLLIMPEXP_BASE wxSortedArrayString;
|
class WXDLLIMPEXP_BASE wxSortedArrayString;
|
||||||
|
class WXDLLIMPEXP_BASE wxArrayString;
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// wxChoice
|
// wxChoice
|
||||||
@ -36,6 +37,18 @@ public:
|
|||||||
|
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxChoice( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr )
|
||||||
|
{
|
||||||
|
m_strings = (wxSortedArrayString *)NULL;
|
||||||
|
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
~wxChoice();
|
~wxChoice();
|
||||||
bool Create( wxWindow *parent, wxWindowID id,
|
bool Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -44,6 +57,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr );
|
const wxString& name = wxChoiceNameStr );
|
||||||
|
bool Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr );
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
void Delete(int n);
|
void Delete(int n);
|
||||||
|
@ -54,6 +54,17 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
inline wxComboBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, value, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
~wxComboBox();
|
~wxComboBox();
|
||||||
|
|
||||||
@ -65,6 +76,14 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxComboBoxNameStr);
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
|
||||||
void Clear();
|
void Clear();
|
||||||
void Delete( int n );
|
void Delete( int n );
|
||||||
|
@ -41,6 +41,19 @@ public:
|
|||||||
#endif // wxUSE_CHECKLISTBOX
|
#endif // wxUSE_CHECKLISTBOX
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxListBox( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr )
|
||||||
|
{
|
||||||
|
#if wxUSE_CHECKLISTBOX
|
||||||
|
m_hasCheckBoxes = FALSE;
|
||||||
|
#endif // wxUSE_CHECKLISTBOX
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
virtual ~wxListBox();
|
virtual ~wxListBox();
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
@ -50,6 +63,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual void Clear();
|
virtual void Clear();
|
||||||
|
@ -41,6 +41,21 @@ public:
|
|||||||
|
|
||||||
Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
|
Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
|
||||||
}
|
}
|
||||||
|
wxRadioBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 1,
|
||||||
|
long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
|
||||||
|
Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
|
||||||
|
}
|
||||||
|
|
||||||
virtual ~wxRadioBox();
|
virtual ~wxRadioBox();
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
@ -54,6 +69,16 @@ public:
|
|||||||
long style = wxRA_HORIZONTAL,
|
long style = wxRA_HORIZONTAL,
|
||||||
const wxValidator& val = wxDefaultValidator,
|
const wxValidator& val = wxDefaultValidator,
|
||||||
const wxString& name = wxRadioBoxNameStr);
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0,
|
||||||
|
long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
|
||||||
int FindString( const wxString& s) const;
|
int FindString( const wxString& s) const;
|
||||||
void SetSelection( int n );
|
void SetSelection( int n );
|
||||||
|
@ -41,6 +41,19 @@ public:
|
|||||||
|
|
||||||
Create(parent, id, pos, size, nStrings, choices, style, validator, name);
|
Create(parent, id, pos, size, nStrings, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxCheckListBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
@ -51,6 +64,14 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
// items may be checked
|
// items may be checked
|
||||||
bool IsChecked(size_t uiIndex) const;
|
bool IsChecked(size_t uiIndex) const;
|
||||||
|
@ -18,7 +18,8 @@
|
|||||||
|
|
||||||
#include "wx/control.h"
|
#include "wx/control.h"
|
||||||
|
|
||||||
#include "wx/dynarray.h"
|
#include "wx/dynarray.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
|
WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
|
||||||
|
|
||||||
@ -46,6 +47,16 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxChoice(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -54,6 +65,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr);
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual int DoAppend(const wxString& item);
|
virtual int DoAppend(const wxString& item);
|
||||||
|
@ -53,6 +53,17 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
|
|||||||
{
|
{
|
||||||
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
inline wxComboBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, value, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxString& value = wxEmptyString,
|
const wxString& value = wxEmptyString,
|
||||||
@ -62,6 +73,14 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxComboBoxNameStr);
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
|
||||||
// List functions
|
// List functions
|
||||||
virtual void Delete(int n);
|
virtual void Delete(int n);
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
// simple types
|
// simple types
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
#include "wx/dynarray.h"
|
#include "wx/dynarray.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#if wxUSE_OWNER_DRAWN
|
#if wxUSE_OWNER_DRAWN
|
||||||
class WXDLLEXPORT wxOwnerDrawn;
|
class WXDLLEXPORT wxOwnerDrawn;
|
||||||
@ -58,6 +58,16 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -66,6 +76,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
virtual ~wxListBox();
|
virtual ~wxListBox();
|
||||||
virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
|
virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
|
||||||
|
@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
class WXDLLEXPORT wxFrame;
|
class WXDLLEXPORT wxFrame;
|
||||||
|
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// Menu
|
// Menu
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@ -35,12 +35,28 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
|
Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
|
||||||
}
|
}
|
||||||
|
inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0, long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, title, pos, size, choices,
|
||||||
|
majorDim, style, val, name);
|
||||||
|
}
|
||||||
~wxRadioBox();
|
~wxRadioBox();
|
||||||
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||||
int n = 0, const wxString choices[] = NULL,
|
int n = 0, const wxString choices[] = NULL,
|
||||||
int majorDim = 0, long style = wxRA_HORIZONTAL,
|
int majorDim = 0, long style = wxRA_HORIZONTAL,
|
||||||
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
|
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0, long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
|
||||||
// Specific functions (in wxWindows2 reference)
|
// Specific functions (in wxWindows2 reference)
|
||||||
virtual void SetSelection(int item);
|
virtual void SetSelection(int item);
|
||||||
|
@ -35,6 +35,14 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
|
wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
@ -43,6 +51,14 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
// items may be checked
|
// items may be checked
|
||||||
bool IsChecked(size_t uiIndex) const;
|
bool IsChecked(size_t uiIndex) const;
|
||||||
void Check(size_t uiIndex, bool bCheck = TRUE);
|
void Check(size_t uiIndex, bool bCheck = TRUE);
|
||||||
|
@ -46,6 +46,18 @@ public:
|
|||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxChoice(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
@ -54,6 +66,14 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr);
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
|
||||||
// implementation of wxControlWithItems
|
// implementation of wxControlWithItems
|
||||||
virtual int GetCount() const;
|
virtual int GetCount() const;
|
||||||
virtual int DoAppend(const wxString& item);
|
virtual int DoAppend(const wxString& item);
|
||||||
|
@ -41,6 +41,20 @@ public:
|
|||||||
style, validator, name);
|
style, validator, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline wxComboBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr)
|
||||||
|
{
|
||||||
|
m_inSetSelection = false;
|
||||||
|
Create(parent, id, value, pos, size, choices,
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxString& value = wxEmptyString,
|
const wxString& value = wxEmptyString,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -50,6 +64,15 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxComboBoxNameStr);
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
|
||||||
// implementation of wxControlWithItems
|
// implementation of wxControlWithItems
|
||||||
virtual int DoAppend(const wxString& item);
|
virtual int DoAppend(const wxString& item);
|
||||||
virtual int DoInsert(const wxString& item, int pos);
|
virtual int DoInsert(const wxString& item, int pos);
|
||||||
|
@ -40,6 +40,17 @@ public:
|
|||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
@ -48,6 +59,14 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
~wxListBox();
|
~wxListBox();
|
||||||
|
|
||||||
// implementation of wxControlWithItems
|
// implementation of wxControlWithItems
|
||||||
|
@ -118,6 +118,7 @@ public:
|
|||||||
wxMenuBar() { Init(); }
|
wxMenuBar() { Init(); }
|
||||||
wxMenuBar(long WXUNUSED(style)) { Init(); }
|
wxMenuBar(long WXUNUSED(style)) { Init(); }
|
||||||
wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
|
wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
|
||||||
|
wxMenuBar(int n, wxMenu *menus[], const wxArrayString& titles);
|
||||||
virtual ~wxMenuBar();
|
virtual ~wxMenuBar();
|
||||||
|
|
||||||
// implement base class (pure) virtuals
|
// implement base class (pure) virtuals
|
||||||
|
@ -46,6 +46,20 @@ public:
|
|||||||
majorDim, style, val, name);
|
majorDim, style, val, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0, long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
|
||||||
|
Create(parent, id, title, pos, size, choices,
|
||||||
|
majorDim, style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
~wxRadioBox();
|
~wxRadioBox();
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
@ -56,6 +70,14 @@ public:
|
|||||||
const wxValidator& val = wxDefaultValidator,
|
const wxValidator& val = wxDefaultValidator,
|
||||||
const wxString& name = wxRadioBoxNameStr);
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0, long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
|
||||||
int FindString(const wxString& s) const;
|
int FindString(const wxString& s) const;
|
||||||
void SetSelection(int N);
|
void SetSelection(int N);
|
||||||
int GetSelection() const;
|
int GetSelection() const;
|
||||||
|
@ -36,6 +36,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -44,6 +51,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
// override base class virtuals
|
// override base class virtuals
|
||||||
virtual void Delete(int n);
|
virtual void Delete(int n);
|
||||||
|
@ -38,6 +38,17 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxChoice(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
@ -47,6 +58,14 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr);
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
virtual int DoAppend(const wxString& item);
|
virtual int DoAppend(const wxString& item);
|
||||||
|
@ -40,6 +40,17 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
Create(parent, id, value, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxComboBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, value, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
@ -51,6 +62,15 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxComboBoxNameStr);
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
|
||||||
// List functions: see wxChoice
|
// List functions: see wxChoice
|
||||||
|
|
||||||
|
@ -53,6 +53,16 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr)
|
||||||
|
{
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -61,6 +71,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
virtual ~wxListBox();
|
virtual ~wxListBox();
|
||||||
|
|
||||||
|
@ -41,6 +41,20 @@ public:
|
|||||||
(void)Create(parent, id, title, pos, size, n, choices, majorDim,
|
(void)Create(parent, id, title, pos, size, n, choices, majorDim,
|
||||||
style, val, name);
|
style, val, name);
|
||||||
}
|
}
|
||||||
|
wxRadioBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0,
|
||||||
|
long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr)
|
||||||
|
{
|
||||||
|
(void)Create(parent, id, title, pos, size, choices, majorDim,
|
||||||
|
style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
~wxRadioBox();
|
~wxRadioBox();
|
||||||
|
|
||||||
@ -54,6 +68,16 @@ public:
|
|||||||
long style = wxRA_HORIZONTAL,
|
long style = wxRA_HORIZONTAL,
|
||||||
const wxValidator& val = wxDefaultValidator,
|
const wxValidator& val = wxDefaultValidator,
|
||||||
const wxString& name = wxRadioBoxNameStr);
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0,
|
||||||
|
long style = wxRA_HORIZONTAL,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
|
||||||
// implement the radiobox interface
|
// implement the radiobox interface
|
||||||
virtual void SetSelection(int n);
|
virtual void SetSelection(int n);
|
||||||
|
@ -38,6 +38,15 @@ public:
|
|||||||
,const wxValidator& rValidator = wxDefaultValidator
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
,const wxString& rsName = wxListBoxNameStr
|
,const wxString& rsName = wxListBoxNameStr
|
||||||
);
|
);
|
||||||
|
wxCheckListBox( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& vSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,long lStyle = 0
|
||||||
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxListBoxNameStr
|
||||||
|
);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Override base class virtuals
|
// Override base class virtuals
|
||||||
|
@ -44,6 +44,27 @@ public:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline wxChoice( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& rSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,long lStyle = 0
|
||||||
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxChoiceNameStr
|
||||||
|
)
|
||||||
|
{
|
||||||
|
Create( pParent
|
||||||
|
,vId
|
||||||
|
,rPos
|
||||||
|
,rSize
|
||||||
|
,asChoices
|
||||||
|
,lStyle
|
||||||
|
,rValidator
|
||||||
|
,rsName
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create( wxWindow* pParent
|
bool Create( wxWindow* pParent
|
||||||
,wxWindowID vId
|
,wxWindowID vId
|
||||||
,const wxPoint& rPos = wxDefaultPosition
|
,const wxPoint& rPos = wxDefaultPosition
|
||||||
@ -55,6 +76,16 @@ public:
|
|||||||
,const wxString& rsName = wxChoiceNameStr
|
,const wxString& rsName = wxChoiceNameStr
|
||||||
);
|
);
|
||||||
|
|
||||||
|
bool Create( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& rSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,long lStyle = 0
|
||||||
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxChoiceNameStr
|
||||||
|
);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Implement base class virtuals
|
// Implement base class virtuals
|
||||||
//
|
//
|
||||||
|
@ -48,6 +48,29 @@ class WXDLLEXPORT wxComboBox : public wxChoice
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline wxComboBox( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxString& rsValue
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& rSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,long lStyle = 0
|
||||||
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxComboBoxNameStr
|
||||||
|
)
|
||||||
|
{
|
||||||
|
Create( pParent
|
||||||
|
,vId
|
||||||
|
,rsValue
|
||||||
|
,rPos
|
||||||
|
,rSize
|
||||||
|
,asChoices
|
||||||
|
,lStyle
|
||||||
|
,rValidator
|
||||||
|
,rsName
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create( wxWindow* pParent
|
bool Create( wxWindow* pParent
|
||||||
,wxWindowID vId
|
,wxWindowID vId
|
||||||
,const wxString& rsValue = wxEmptyString
|
,const wxString& rsValue = wxEmptyString
|
||||||
@ -60,6 +83,17 @@ class WXDLLEXPORT wxComboBox : public wxChoice
|
|||||||
,const wxString& rsName = wxComboBoxNameStr
|
,const wxString& rsName = wxComboBoxNameStr
|
||||||
);
|
);
|
||||||
|
|
||||||
|
bool Create( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxString& rsValue
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& rSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,long lStyle = 0
|
||||||
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxComboBoxNameStr
|
||||||
|
);
|
||||||
|
|
||||||
//
|
//
|
||||||
// List functions: see wxChoice
|
// List functions: see wxChoice
|
||||||
//
|
//
|
||||||
|
@ -58,6 +58,25 @@ public:
|
|||||||
,rsName
|
,rsName
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
wxListBox( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& rSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,long lStyle = 0
|
||||||
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxListBoxNameStr)
|
||||||
|
{
|
||||||
|
Create( pParent
|
||||||
|
,vId
|
||||||
|
,rPos
|
||||||
|
,rSize
|
||||||
|
,asChoices
|
||||||
|
,lStyle
|
||||||
|
,rValidator
|
||||||
|
,rsName
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
bool Create( wxWindow* pParent
|
bool Create( wxWindow* pParent
|
||||||
,wxWindowID vId
|
,wxWindowID vId
|
||||||
@ -69,6 +88,15 @@ public:
|
|||||||
,const wxValidator& rValidator = wxDefaultValidator
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
,const wxString& rsName = wxListBoxNameStr
|
,const wxString& rsName = wxListBoxNameStr
|
||||||
);
|
);
|
||||||
|
bool Create( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& rSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,long lStyle = 0
|
||||||
|
,const wxValidator& rValidator = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxListBoxNameStr
|
||||||
|
);
|
||||||
|
|
||||||
virtual ~wxListBox();
|
virtual ~wxListBox();
|
||||||
|
|
||||||
|
@ -47,6 +47,31 @@ public:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline wxRadioBox( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxString& rsTitle
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& rSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,int nMajorDim = 0
|
||||||
|
,long lStyle = wxRA_HORIZONTAL
|
||||||
|
,const wxValidator& rVal = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxRadioBoxNameStr
|
||||||
|
)
|
||||||
|
{
|
||||||
|
Create( pParent
|
||||||
|
,vId
|
||||||
|
,rsTitle
|
||||||
|
,rPos
|
||||||
|
,rSize
|
||||||
|
,asChoices
|
||||||
|
,nMajorDim
|
||||||
|
,lStyle
|
||||||
|
,rVal
|
||||||
|
,rsName
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
~wxRadioBox();
|
~wxRadioBox();
|
||||||
|
|
||||||
bool Create( wxWindow* pParent
|
bool Create( wxWindow* pParent
|
||||||
@ -62,6 +87,18 @@ public:
|
|||||||
,const wxString& rsName = wxRadioBoxNameStr
|
,const wxString& rsName = wxRadioBoxNameStr
|
||||||
);
|
);
|
||||||
|
|
||||||
|
bool Create( wxWindow* pParent
|
||||||
|
,wxWindowID vId
|
||||||
|
,const wxString& rsTitle
|
||||||
|
,const wxPoint& rPos
|
||||||
|
,const wxSize& rSize
|
||||||
|
,const wxArrayString& asChoices
|
||||||
|
,int nMajorDim = 0
|
||||||
|
,long lStyle = wxRA_HORIZONTAL
|
||||||
|
,const wxValidator& rVal = wxDefaultValidator
|
||||||
|
,const wxString& rsName = wxRadioBoxNameStr
|
||||||
|
);
|
||||||
|
|
||||||
void Command(wxCommandEvent& rEvent);
|
void Command(wxCommandEvent& rEvent);
|
||||||
bool ContainsHWND(WXHWND hWnd) const;
|
bool ContainsHWND(WXHWND hWnd) const;
|
||||||
virtual bool Enable(bool bEnable = TRUE);
|
virtual bool Enable(bool bEnable = TRUE);
|
||||||
|
@ -46,6 +46,14 @@ public:
|
|||||||
|
|
||||||
Create(parent, id, pos, size, nStrings, choices, style, validator, name);
|
Create(parent, id, pos, size, nStrings, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxCheckListBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
@ -56,6 +64,14 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
// implement check list box methods
|
// implement check list box methods
|
||||||
virtual bool IsChecked(size_t item) const;
|
virtual bool IsChecked(size_t item) const;
|
||||||
|
@ -34,6 +34,13 @@ public:
|
|||||||
{
|
{
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxChoice(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@ -42,6 +49,13 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxChoiceNameStr);
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxChoiceNameStr);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void OnComboBox(wxCommandEvent &event);
|
void OnComboBox(wxCommandEvent &event);
|
||||||
|
@ -231,6 +231,15 @@ public:
|
|||||||
(void)Create(parent, id, value, pos, size, n, choices,
|
(void)Create(parent, id, value, pos, size, n, choices,
|
||||||
style, validator, name);
|
style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxComboBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
@ -242,7 +251,15 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxComboBoxNameStr);
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxComboBoxNameStr);
|
||||||
|
|
||||||
virtual ~wxComboBox();
|
virtual ~wxComboBox();
|
||||||
|
|
||||||
|
@ -70,6 +70,14 @@ public:
|
|||||||
|
|
||||||
Create(parent, id, pos, size, n, choices, style, validator, name);
|
Create(parent, id, pos, size, n, choices, style, validator, name);
|
||||||
}
|
}
|
||||||
|
wxListBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr );
|
||||||
|
|
||||||
virtual ~wxListBox();
|
virtual ~wxListBox();
|
||||||
|
|
||||||
@ -81,6 +89,14 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr);
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString& name = wxListBoxNameStr);
|
||||||
|
|
||||||
// implement the listbox interface defined by wxListBoxBase
|
// implement the listbox interface defined by wxListBoxBase
|
||||||
virtual void Clear();
|
virtual void Clear();
|
||||||
|
@ -50,6 +50,16 @@ public:
|
|||||||
(void)Create(parent, id, title, pos, size, n, choices,
|
(void)Create(parent, id, title, pos, size, n, choices,
|
||||||
majorDim, style, val, name);
|
majorDim, style, val, name);
|
||||||
}
|
}
|
||||||
|
wxRadioBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0,
|
||||||
|
long style = wxRA_SPECIFY_COLS,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
@ -61,6 +71,16 @@ public:
|
|||||||
long style = wxRA_SPECIFY_COLS,
|
long style = wxRA_SPECIFY_COLS,
|
||||||
const wxValidator& val = wxDefaultValidator,
|
const wxValidator& val = wxDefaultValidator,
|
||||||
const wxString& name = wxRadioBoxNameStr);
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim = 0,
|
||||||
|
long style = wxRA_SPECIFY_COLS,
|
||||||
|
const wxValidator& val = wxDefaultValidator,
|
||||||
|
const wxString& name = wxRadioBoxNameStr);
|
||||||
|
|
||||||
virtual ~wxRadioBox();
|
virtual ~wxRadioBox();
|
||||||
|
|
||||||
|
@ -21,6 +21,20 @@ BEGIN_EVENT_TABLE(wxCheckListBox, wxCheckListBoxBase)
|
|||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
// WX_IMPLEMENT_COCOA_OWNER(wxCheckListBox,NSButton,NSControl,NSView)
|
// WX_IMPLEMENT_COCOA_OWNER(wxCheckListBox,NSButton,NSControl,NSView)
|
||||||
|
|
||||||
|
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, winid, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
|
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/choice.h"
|
#include "wx/choice.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
#endif //WX_PRECOMP
|
#endif //WX_PRECOMP
|
||||||
|
|
||||||
#include "wx/cocoa/string.h"
|
#include "wx/cocoa/string.h"
|
||||||
@ -33,6 +34,20 @@ void wxChoice::Init()
|
|||||||
m_sortedStrings = NULL;
|
m_sortedStrings = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxChoice::Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, winid, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxChoice::Create(wxWindow *parent, wxWindowID winid,
|
bool wxChoice::Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
|
@ -27,6 +27,21 @@ BEGIN_EVENT_TABLE(wxComboBox, wxTextCtrl)
|
|||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
// WX_IMPLEMENT_COCOA_OWNER(wxComboBox,NSComboBox,NSTextField,NSView)
|
// WX_IMPLEMENT_COCOA_OWNER(wxComboBox,NSComboBox,NSTextField,NSView)
|
||||||
|
|
||||||
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, winid, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxString& value,
|
const wxString& value,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
|
@ -30,6 +30,20 @@ BEGIN_EVENT_TABLE(wxListBox, wxListBoxBase)
|
|||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)
|
WX_IMPLEMENT_COCOA_OWNER(wxListBox,NSTableView,NSControl,NSView)
|
||||||
|
|
||||||
|
bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, winid, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
|
bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/radiobox.h"
|
#include "wx/radiobox.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
#endif //WX_PRECOMP
|
#endif //WX_PRECOMP
|
||||||
|
|
||||||
#import <AppKit/NSView.h>
|
#import <AppKit/NSView.h>
|
||||||
@ -22,6 +23,21 @@ BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
|
|||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
// WX_IMPLEMENT_COCOA_OWNER(wxRadioBox,NSTextField,NSControl,NSView)
|
// WX_IMPLEMENT_COCOA_OWNER(wxRadioBox,NSTextField,NSControl,NSView)
|
||||||
|
|
||||||
|
bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, winid, title, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
|
bool wxRadioBox::Create(wxWindow *parent, wxWindowID winid,
|
||||||
const wxString& title,
|
const wxString& title,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
|
@ -285,6 +285,19 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxAnyChoiceDialog::Create(wxWindow *parent,
|
||||||
|
const wxString& message,
|
||||||
|
const wxString& caption,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long styleDlg,
|
||||||
|
const wxPoint& pos,
|
||||||
|
long styleLbox)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, message, caption, chs.GetCount(), chs.GetStrings(),
|
||||||
|
styleDlg, pos, styleLbox);
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxSingleChoiceDialog
|
// wxSingleChoiceDialog
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@ -308,6 +321,17 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
|
|||||||
Create(parent, message, caption, n, choices, clientData, style);
|
Create(parent, message, caption, n, choices, clientData, style);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
|
||||||
|
const wxString& message,
|
||||||
|
const wxString& caption,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
char **clientData,
|
||||||
|
long style,
|
||||||
|
const wxPoint& WXUNUSED(pos))
|
||||||
|
{
|
||||||
|
Create(parent, message, caption, choices, clientData, style);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxSingleChoiceDialog::Create( wxWindow *parent,
|
bool wxSingleChoiceDialog::Create( wxWindow *parent,
|
||||||
const wxString& message,
|
const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
@ -333,6 +357,19 @@ bool wxSingleChoiceDialog::Create( wxWindow *parent,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxSingleChoiceDialog::Create( wxWindow *parent,
|
||||||
|
const wxString& message,
|
||||||
|
const wxString& caption,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
char **clientData,
|
||||||
|
long style,
|
||||||
|
const wxPoint& pos )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create( parent, message, caption, chs.GetCount(), chs.GetStrings(),
|
||||||
|
clientData, style, pos );
|
||||||
|
}
|
||||||
|
|
||||||
// Set the selection
|
// Set the selection
|
||||||
void wxSingleChoiceDialog::SetSelection(int sel)
|
void wxSingleChoiceDialog::SetSelection(int sel)
|
||||||
{
|
{
|
||||||
@ -383,6 +420,18 @@ bool wxMultiChoiceDialog::Create( wxWindow *parent,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxMultiChoiceDialog::Create( wxWindow *parent,
|
||||||
|
const wxString& message,
|
||||||
|
const wxString& caption,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxPoint& pos )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create( parent, message, caption, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, pos );
|
||||||
|
}
|
||||||
|
|
||||||
void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
|
void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
|
||||||
{
|
{
|
||||||
size_t count = selections.GetCount();
|
size_t count = selections.GetCount();
|
||||||
|
@ -1398,20 +1398,11 @@ void wxGridCellChoiceEditor::Create(wxWindow* parent,
|
|||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
wxEvtHandler* evtHandler)
|
wxEvtHandler* evtHandler)
|
||||||
{
|
{
|
||||||
size_t count = m_choices.GetCount();
|
|
||||||
wxString *choices = new wxString[count];
|
|
||||||
for ( size_t n = 0; n < count; n++ )
|
|
||||||
{
|
|
||||||
choices[n] = m_choices[n];
|
|
||||||
}
|
|
||||||
|
|
||||||
m_control = new wxComboBox(parent, id, wxEmptyString,
|
m_control = new wxComboBox(parent, id, wxEmptyString,
|
||||||
wxDefaultPosition, wxDefaultSize,
|
wxDefaultPosition, wxDefaultSize,
|
||||||
count, choices,
|
m_choices,
|
||||||
m_allowOthers ? 0 : wxCB_READONLY);
|
m_allowOthers ? 0 : wxCB_READONLY);
|
||||||
|
|
||||||
delete [] choices;
|
|
||||||
|
|
||||||
wxGridCellEditor::Create(parent, id, evtHandler);
|
wxGridCellEditor::Create(parent, id, evtHandler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,6 +48,19 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
|||||||
wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
|
wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name )
|
||||||
|
{
|
||||||
|
m_hasCheckBoxes = TRUE;
|
||||||
|
wxListBox::Create( parent, id, pos, size, choices,
|
||||||
|
style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCheckListBox::IsChecked( int index ) const
|
bool wxCheckListBox::IsChecked( int index ) const
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") );
|
wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") );
|
||||||
|
@ -73,6 +73,18 @@ wxChoice::wxChoice()
|
|||||||
m_strings = (wxSortedArrayString *)NULL;
|
m_strings = (wxSortedArrayString *)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint &pos, const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString &name )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint &pos, const wxSize &size,
|
const wxPoint &pos, const wxSize &size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#if wxUSE_COMBOBOX
|
#if wxUSE_COMBOBOX
|
||||||
|
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
|
|
||||||
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
|
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
|
||||||
@ -102,6 +103,19 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
|
|||||||
EVT_CHAR(wxComboBox::OnChar)
|
EVT_CHAR(wxComboBox::OnChar)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
|
bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString& name )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create( parent, id, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||||
const wxPoint& pos, const wxSize& size,
|
const wxPoint& pos, const wxSize& size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
|
@ -316,6 +316,18 @@ wxListBox::wxListBox()
|
|||||||
#endif // wxUSE_CHECKLISTBOX
|
#endif // wxUSE_CHECKLISTBOX
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint &pos, const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString &name )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint &pos, const wxSize &size,
|
const wxPoint &pos, const wxSize &size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
|
@ -168,6 +168,19 @@ void wxRadioBox::Init()
|
|||||||
m_lostFocus = FALSE;
|
m_lostFocus = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint &pos, const wxSize &size,
|
||||||
|
const wxArrayString& choices, int majorDim,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString &name )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create( parent, id, title, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
|
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
const wxPoint &pos, const wxSize &size,
|
const wxPoint &pos, const wxSize &size,
|
||||||
int n, const wxString choices[], int majorDim,
|
int n, const wxString choices[], int majorDim,
|
||||||
|
@ -48,6 +48,19 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
|||||||
wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
|
wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name )
|
||||||
|
{
|
||||||
|
m_hasCheckBoxes = TRUE;
|
||||||
|
wxListBox::Create( parent, id, pos, size, choices,
|
||||||
|
style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCheckListBox::IsChecked( int index ) const
|
bool wxCheckListBox::IsChecked( int index ) const
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") );
|
wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") );
|
||||||
|
@ -73,6 +73,18 @@ wxChoice::wxChoice()
|
|||||||
m_strings = (wxSortedArrayString *)NULL;
|
m_strings = (wxSortedArrayString *)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint &pos, const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString &name )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint &pos, const wxSize &size,
|
const wxPoint &pos, const wxSize &size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#if wxUSE_COMBOBOX
|
#if wxUSE_COMBOBOX
|
||||||
|
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
|
|
||||||
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
|
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
|
||||||
@ -102,6 +103,19 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
|
|||||||
EVT_CHAR(wxComboBox::OnChar)
|
EVT_CHAR(wxComboBox::OnChar)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
|
bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString& name )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create( parent, id, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||||
const wxPoint& pos, const wxSize& size,
|
const wxPoint& pos, const wxSize& size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
|
@ -316,6 +316,18 @@ wxListBox::wxListBox()
|
|||||||
#endif // wxUSE_CHECKLISTBOX
|
#endif // wxUSE_CHECKLISTBOX
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint &pos, const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString &name )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint &pos, const wxSize &size,
|
const wxPoint &pos, const wxSize &size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
|
@ -168,6 +168,19 @@ void wxRadioBox::Init()
|
|||||||
m_lostFocus = FALSE;
|
m_lostFocus = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint &pos, const wxSize &size,
|
||||||
|
const wxArrayString& choices, int majorDim,
|
||||||
|
long style, const wxValidator& validator,
|
||||||
|
const wxString &name )
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create( parent, id, title, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
|
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
const wxPoint &pos, const wxSize &size,
|
const wxPoint &pos, const wxSize &size,
|
||||||
int n, const wxString choices[], int majorDim,
|
int n, const wxString choices[], int majorDim,
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#if wxUSE_CHECKLISTBOX
|
#if wxUSE_CHECKLISTBOX
|
||||||
|
|
||||||
#include "wx/checklst.h"
|
#include "wx/checklst.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#include "wx/mac/uma.h"
|
#include "wx/mac/uma.h"
|
||||||
#include "Appearance.h"
|
#include "Appearance.h"
|
||||||
@ -172,6 +173,21 @@ void wxCheckListBox::Init()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxCheckListBox::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos,
|
||||||
|
const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString &name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCheckListBox::Create(wxWindow *parent,
|
bool wxCheckListBox::Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxPoint &pos,
|
const wxPoint &pos,
|
||||||
|
@ -38,6 +38,20 @@ wxChoice::~wxChoice()
|
|||||||
// DisposeMenu( m_macPopUpMenuHandle ) ;
|
// DisposeMenu( m_macPopUpMenuHandle ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
|
@ -256,6 +256,22 @@ void wxComboBox::DelegateChoice( const wxString& value )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs( choices );
|
||||||
|
|
||||||
|
return Create( parent, id, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxString& value,
|
const wxString& value,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
|
@ -193,6 +193,20 @@ wxListBox::wxListBox()
|
|||||||
|
|
||||||
static ListDefUPP macListDefUPP = NULL ;
|
static ListDefUPP macListDefUPP = NULL ;
|
||||||
|
|
||||||
|
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#include "wx/radiobox.h"
|
#include "wx/radiobox.h"
|
||||||
#include "wx/radiobut.h"
|
#include "wx/radiobut.h"
|
||||||
@ -93,6 +94,18 @@ wxRadioBox::~wxRadioBox()
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
// Create the radiobox for two-step construction
|
// Create the radiobox for two-step construction
|
||||||
|
|
||||||
|
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim, long style,
|
||||||
|
const wxValidator& val, const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, label, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
|
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
|
||||||
const wxPoint& pos, const wxSize& size,
|
const wxPoint& pos, const wxSize& size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#if wxUSE_CHECKLISTBOX
|
#if wxUSE_CHECKLISTBOX
|
||||||
|
|
||||||
#include "wx/checklst.h"
|
#include "wx/checklst.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#include "wx/mac/uma.h"
|
#include "wx/mac/uma.h"
|
||||||
#include "Appearance.h"
|
#include "Appearance.h"
|
||||||
@ -172,6 +173,21 @@ void wxCheckListBox::Init()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxCheckListBox::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos,
|
||||||
|
const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString &name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCheckListBox::Create(wxWindow *parent,
|
bool wxCheckListBox::Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxPoint &pos,
|
const wxPoint &pos,
|
||||||
|
@ -38,6 +38,20 @@ wxChoice::~wxChoice()
|
|||||||
// DisposeMenu( m_macPopUpMenuHandle ) ;
|
// DisposeMenu( m_macPopUpMenuHandle ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
|
@ -256,6 +256,22 @@ void wxComboBox::DelegateChoice( const wxString& value )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs( choices );
|
||||||
|
|
||||||
|
return Create( parent, id, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxString& value,
|
const wxString& value,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
|
@ -193,6 +193,20 @@ wxListBox::wxListBox()
|
|||||||
|
|
||||||
static ListDefUPP macListDefUPP = NULL ;
|
static ListDefUPP macListDefUPP = NULL ;
|
||||||
|
|
||||||
|
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#include "wx/radiobox.h"
|
#include "wx/radiobox.h"
|
||||||
#include "wx/radiobut.h"
|
#include "wx/radiobut.h"
|
||||||
@ -93,6 +94,18 @@ wxRadioBox::~wxRadioBox()
|
|||||||
//-------------------------------------------------------------------------------------
|
//-------------------------------------------------------------------------------------
|
||||||
// Create the radiobox for two-step construction
|
// Create the radiobox for two-step construction
|
||||||
|
|
||||||
|
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim, long style,
|
||||||
|
const wxValidator& val, const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, label, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
|
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
|
||||||
const wxPoint& pos, const wxSize& size,
|
const wxPoint& pos, const wxSize& size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
|
@ -75,6 +75,17 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
|||||||
style, val, name);
|
style, val, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style, const wxValidator& val,
|
||||||
|
const wxString& name)
|
||||||
|
: wxCheckListBoxBase()
|
||||||
|
{
|
||||||
|
Create(parent, id, pos, size, choices,
|
||||||
|
style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
@ -89,6 +100,20 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
return retVal;
|
return retVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
// wxListBox::Create calls set, which adds the prefixes
|
||||||
|
bool retVal = wxListBox::Create(parent, id, pos, size, choices,
|
||||||
|
style, validator, name);
|
||||||
|
return retVal;
|
||||||
|
}
|
||||||
|
|
||||||
// check items
|
// check items
|
||||||
// -----------
|
// -----------
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
#include "wx/choice.h"
|
#include "wx/choice.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#ifdef __VMS__
|
#ifdef __VMS__
|
||||||
#pragma message disable nosimpint
|
#pragma message disable nosimpint
|
||||||
@ -143,6 +144,19 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
wxChoice::~wxChoice()
|
wxChoice::~wxChoice()
|
||||||
{
|
{
|
||||||
// For some reason destroying the menuWidget
|
// For some reason destroying the menuWidget
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
#if wxUSE_COMBOBOX
|
#if wxUSE_COMBOBOX
|
||||||
|
|
||||||
#include "wx/combobox.h"
|
#include "wx/combobox.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#ifdef __VMS__
|
#ifdef __VMS__
|
||||||
#pragma message disable nosimpint
|
#pragma message disable nosimpint
|
||||||
@ -93,6 +94,20 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
wxComboBox::~wxComboBox()
|
wxComboBox::~wxComboBox()
|
||||||
{
|
{
|
||||||
DetachWidget((Widget) m_mainWidget); // Removes event handlers
|
DetachWidget((Widget) m_mainWidget); // Removes event handlers
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#if wxUSE_COMBOBOX
|
#if wxUSE_COMBOBOX
|
||||||
|
|
||||||
#include "wx/combobox.h"
|
#include "wx/combobox.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#ifdef __VMS__
|
#ifdef __VMS__
|
||||||
#pragma message disable nosimpint
|
#pragma message disable nosimpint
|
||||||
@ -122,6 +123,20 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
void wxComboBox::AdjustDropDownListSize()
|
void wxComboBox::AdjustDropDownListSize()
|
||||||
{
|
{
|
||||||
int newListCount = -1, itemCount = GetCount();
|
int newListCount = -1, itemCount = GetCount();
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "wx/dynarray.h"
|
#include "wx/dynarray.h"
|
||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#ifdef __VMS__
|
#ifdef __VMS__
|
||||||
#pragma message disable nosimpint
|
#pragma message disable nosimpint
|
||||||
@ -157,6 +158,19 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
wxListBox::~wxListBox()
|
wxListBox::~wxListBox()
|
||||||
{
|
{
|
||||||
if( HasClientObjectData() )
|
if( HasClientObjectData() )
|
||||||
|
@ -206,6 +206,17 @@ void wxMenuBar::Init()
|
|||||||
m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxArrayString& titles)
|
||||||
|
{
|
||||||
|
wxASSERT( size_t(n) == titles.GetCount() );
|
||||||
|
|
||||||
|
Init();
|
||||||
|
|
||||||
|
m_titles = titles;
|
||||||
|
for ( int i = 0; i < n; i++ )
|
||||||
|
m_menus.Append(menus[i]);
|
||||||
|
}
|
||||||
|
|
||||||
wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
|
wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
#include "wx/radiobox.h"
|
#include "wx/radiobox.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#ifdef __VMS__
|
#ifdef __VMS__
|
||||||
#pragma message disable nosimpint
|
#pragma message disable nosimpint
|
||||||
@ -157,6 +158,16 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim, long style,
|
||||||
|
const wxValidator& val, const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, title, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
wxRadioBox::~wxRadioBox()
|
wxRadioBox::~wxRadioBox()
|
||||||
{
|
{
|
||||||
|
@ -345,6 +345,15 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
|||||||
Create(parent, id, pos, size, nStrings, choices, style, val, name);
|
Create(parent, id, pos, size, nStrings, choices, style, val, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style, const wxValidator& val,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
Create(parent, id, pos, size, choices, style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos, const wxSize& size,
|
const wxPoint& pos, const wxSize& size,
|
||||||
int n, const wxString choices[],
|
int n, const wxString choices[],
|
||||||
@ -355,6 +364,16 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
style | wxLB_OWNERDRAW, validator, name);
|
style | wxLB_OWNERDRAW, validator, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator, const wxString& name)
|
||||||
|
{
|
||||||
|
return wxListBox::Create(parent, id, pos, size, choices,
|
||||||
|
style | wxLB_OWNERDRAW, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
// misc overloaded methods
|
// misc overloaded methods
|
||||||
// -----------------------
|
// -----------------------
|
||||||
|
|
||||||
|
@ -151,6 +151,20 @@ bool wxChoice::Create(wxWindow *parent,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxChoice::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
wxChoice::~wxChoice()
|
wxChoice::~wxChoice()
|
||||||
{
|
{
|
||||||
Free();
|
Free();
|
||||||
|
@ -433,6 +433,20 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
void wxComboBox::SetValue(const wxString& value)
|
void wxComboBox::SetValue(const wxString& value)
|
||||||
{
|
{
|
||||||
if ( HasFlag(wxCB_READONLY) )
|
if ( HasFlag(wxCB_READONLY) )
|
||||||
|
@ -251,6 +251,20 @@ bool wxListBox::Create(wxWindow *parent,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxListBox::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& wxVALIDATOR_PARAM(validator),
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
wxListBox::~wxListBox()
|
wxListBox::~wxListBox()
|
||||||
{
|
{
|
||||||
Free();
|
Free();
|
||||||
|
@ -352,6 +352,22 @@ bool wxRadioBox::Create(wxWindow *parent,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxRadioBox::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim,
|
||||||
|
long style,
|
||||||
|
const wxValidator& val,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
return Create(parent, id, title, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
wxRadioBox::~wxRadioBox()
|
wxRadioBox::~wxRadioBox()
|
||||||
{
|
{
|
||||||
m_isBeingDeleted = TRUE;
|
m_isBeingDeleted = TRUE;
|
||||||
|
@ -291,6 +291,31 @@ wxCheckListBox::wxCheckListBox (
|
|||||||
);
|
);
|
||||||
} // end of wxCheckListBox::wxCheckListBox
|
} // end of wxCheckListBox::wxCheckListBox
|
||||||
|
|
||||||
|
wxCheckListBox::wxCheckListBox (
|
||||||
|
wxWindow* pParent
|
||||||
|
, wxWindowID vId
|
||||||
|
, const wxPoint& rPos
|
||||||
|
, const wxSize& rSize
|
||||||
|
, const wxArrayString& asChoices
|
||||||
|
, long lStyle
|
||||||
|
, const wxValidator& rVal
|
||||||
|
, const wxString& rsName
|
||||||
|
)
|
||||||
|
: wxListBox()
|
||||||
|
{
|
||||||
|
wxCArrayString chs(asChoices);
|
||||||
|
Create( pParent
|
||||||
|
,vId
|
||||||
|
,rPos
|
||||||
|
,rSize
|
||||||
|
,chs.GetCount()
|
||||||
|
,chs.GetStrings()
|
||||||
|
,lStyle | wxLB_OWNERDRAW
|
||||||
|
,rVal
|
||||||
|
,rsName
|
||||||
|
);
|
||||||
|
} // end of wxCheckListBox::wxCheckListBox
|
||||||
|
|
||||||
void wxCheckListBox::Delete(
|
void wxCheckListBox::Delete(
|
||||||
int N
|
int N
|
||||||
)
|
)
|
||||||
|
@ -23,6 +23,23 @@
|
|||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
|
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
|
||||||
|
|
||||||
|
bool wxChoice::Create(
|
||||||
|
wxWindow* pParent
|
||||||
|
, wxWindowID vId
|
||||||
|
, const wxPoint& rPos
|
||||||
|
, const wxSize& rSize
|
||||||
|
, const wxArrayString& asChoices
|
||||||
|
, long lStyle
|
||||||
|
, const wxValidator& rValidator
|
||||||
|
, const wxString& rsName
|
||||||
|
)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(asChoices);
|
||||||
|
|
||||||
|
return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(),
|
||||||
|
lStyle, rValidator, rsName);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxChoice::Create(
|
bool wxChoice::Create(
|
||||||
wxWindow* pParent
|
wxWindow* pParent
|
||||||
, wxWindowID vId
|
, wxWindowID vId
|
||||||
|
@ -86,6 +86,24 @@ bool wxComboBox::OS2Command(
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
} // end of wxComboBox::OS2Command
|
} // end of wxComboBox::OS2Command
|
||||||
|
|
||||||
|
bool wxComboBox::Create(
|
||||||
|
wxWindow* pParent
|
||||||
|
, wxWindowID vId
|
||||||
|
, const wxString& rsValue
|
||||||
|
, const wxPoint& rPos
|
||||||
|
, const wxSize& rSize
|
||||||
|
, const wxArrayString& asChoices
|
||||||
|
, long lStyle
|
||||||
|
, const wxValidator& rValidator
|
||||||
|
, const wxString& rsName
|
||||||
|
)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(asChoices);
|
||||||
|
|
||||||
|
return Create(pParent, vId, rsValue, rPos, rSize, chs.GetCount(),
|
||||||
|
chs.GetStrings(), lStyle, rValidator, rsName);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxComboBox::Create(
|
bool wxComboBox::Create(
|
||||||
wxWindow* pParent
|
wxWindow* pParent
|
||||||
, wxWindowID vId
|
, wxWindowID vId
|
||||||
|
@ -85,6 +85,23 @@ wxListBox::wxListBox()
|
|||||||
m_nSelected = 0;
|
m_nSelected = 0;
|
||||||
} // end of wxListBox::wxListBox
|
} // end of wxListBox::wxListBox
|
||||||
|
|
||||||
|
bool wxListBox::Create(
|
||||||
|
wxWindow* pParent
|
||||||
|
, wxWindowID vId
|
||||||
|
, const wxPoint& rPos
|
||||||
|
, const wxSize& rSize
|
||||||
|
, const wxArrayString& asChoices
|
||||||
|
, long lStyle
|
||||||
|
, const wxValidator& rValidator
|
||||||
|
, const wxString& rsName
|
||||||
|
)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(asChoices);
|
||||||
|
|
||||||
|
return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(),
|
||||||
|
lStyle, rValidator, rsName);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxListBox::Create(
|
bool wxListBox::Create(
|
||||||
wxWindow* pParent
|
wxWindow* pParent
|
||||||
, wxWindowID vId
|
, wxWindowID vId
|
||||||
|
@ -253,6 +253,25 @@ bool wxRadioBox::ContainsHWND(
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
} // end of wxRadioBox::ContainsHWND
|
} // end of wxRadioBox::ContainsHWND
|
||||||
|
|
||||||
|
bool wxRadioBox::Create(
|
||||||
|
wxWindow* pParent
|
||||||
|
, wxWindowID vId
|
||||||
|
, const wxString& rsTitle
|
||||||
|
, const wxPoint& rPos
|
||||||
|
, const wxSize& rSize
|
||||||
|
, const wxArrayString& asChoices
|
||||||
|
, int nMajorDim
|
||||||
|
, long lStyle
|
||||||
|
, const wxValidator& rVal
|
||||||
|
, const wxString& rsName
|
||||||
|
)
|
||||||
|
{
|
||||||
|
wxCArrayString(asChoices);
|
||||||
|
|
||||||
|
return Create(pParent, vId, rsTitle, rPos, rSize, chs.GetCount(),
|
||||||
|
chs.GetStrings(), nMajorDim, lStyle, rVal, rsName);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxRadioBox::Create(
|
bool wxRadioBox::Create(
|
||||||
wxWindow* pParent
|
wxWindow* pParent
|
||||||
, wxWindowID vId
|
, wxWindowID vId
|
||||||
|
@ -55,6 +55,35 @@ void wxCheckListBox::Init()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxCheckListBox::wxCheckListBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos,
|
||||||
|
const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString &name)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxCheckListBox::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos,
|
||||||
|
const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString &name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxCheckListBox::Create(wxWindow *parent,
|
bool wxCheckListBox::Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxPoint &pos,
|
const wxPoint &pos,
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/choice.h"
|
#include "wx/choice.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
|
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
|
||||||
@ -39,6 +40,31 @@ BEGIN_EVENT_TABLE(wxChoice, wxComboBox)
|
|||||||
EVT_COMBOBOX(-1, wxChoice::OnComboBox)
|
EVT_COMBOBOX(-1, wxChoice::OnComboBox)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
|
wxChoice::wxChoice(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
|
@ -657,6 +657,37 @@ void wxComboBox::Init()
|
|||||||
m_lbox = (wxListBox *)NULL;
|
m_lbox = (wxListBox *)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxComboBox::wxComboBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
|
||||||
|
Create(parent, id, value, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxComboBox::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& value,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, value, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxComboBox::Create(wxWindow *parent,
|
bool wxComboBox::Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxString& value,
|
const wxString& value,
|
||||||
|
@ -80,6 +80,35 @@ void wxListBox::Init()
|
|||||||
m_showScrollbarY = FALSE;
|
m_showScrollbarY = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxListBox::wxListBox(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos,
|
||||||
|
const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString &name)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
|
||||||
|
Create(parent, id, pos, size, choices, style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxListBox::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos,
|
||||||
|
const wxSize &size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString &name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
|
||||||
|
style, validator, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxListBox::Create(wxWindow *parent,
|
bool wxListBox::Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxPoint &pos,
|
const wxPoint &pos,
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
#include "wx/radiobox.h"
|
#include "wx/radiobox.h"
|
||||||
#include "wx/radiobut.h"
|
#include "wx/radiobut.h"
|
||||||
#include "wx/validate.h"
|
#include "wx/validate.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/tooltip.h"
|
#include "wx/tooltip.h"
|
||||||
@ -101,6 +102,37 @@ void wxRadioBox::Init()
|
|||||||
m_majorDim = 0;
|
m_majorDim = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||||
|
const wxPoint& pos, const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim, long style,
|
||||||
|
const wxValidator& val, const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
Init();
|
||||||
|
|
||||||
|
(void)Create(parent, id, title, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wxRadioBox::Create(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
const wxArrayString& choices,
|
||||||
|
int majorDim,
|
||||||
|
long style,
|
||||||
|
const wxValidator& val,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
wxCArrayString chs(choices);
|
||||||
|
|
||||||
|
return Create(parent, id, title, pos, size, chs.GetCount(),
|
||||||
|
chs.GetStrings(), majorDim, style, val, name);
|
||||||
|
}
|
||||||
|
|
||||||
bool wxRadioBox::Create(wxWindow *parent,
|
bool wxRadioBox::Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxString& title,
|
const wxString& title,
|
||||||
|
Loading…
Reference in New Issue
Block a user