projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Must have valid colours for X11 popup window implementation
[wxWidgets.git]
/
include
/
wx
/
univ
/
choice.h
diff --git
a/include/wx/univ/choice.h
b/include/wx/univ/choice.h
index a96d443d0215ac0b44388dccd3969ef2e5d89255..7e7d8522398ee6ce9f7076b32592446570b9aede 100644
(file)
--- a/
include/wx/univ/choice.h
+++ b/
include/wx/univ/choice.h
@@
-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,
const wxPoint& pos = wxDefaultPosition,
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@
-42,6
+49,13
@@
public:
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr);
long style = 0,
const wxValidator& validator = wxDefaultValidator,
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:
void OnComboBox(wxCommandEvent &event);
private:
void OnComboBox(wxCommandEvent &event);