projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some updates
[wxWidgets.git]
/
include
/
wx
/
univ
/
combobox.h
diff --git
a/include/wx/univ/combobox.h
b/include/wx/univ/combobox.h
index cb61271782b578f849b1574763b02e5d346b1ee9..581ffdc0851b9794ca3deb577739cdf1793d6873 100644
(file)
--- a/
include/wx/univ/combobox.h
+++ b/
include/wx/univ/combobox.h
@@
-37,7
+37,7
@@
#define _WX_UNIV_COMBOBOX_H_
#ifdef __GNUG__
#define _WX_UNIV_COMBOBOX_H_
#ifdef __GNUG__
- #pragma i
mplementation "
combobox.h"
+ #pragma i
nterface "univ
combobox.h"
#endif
class WXDLLEXPORT wxComboControl;
#endif
class WXDLLEXPORT wxComboControl;
@@
-174,7
+174,7
@@
protected:
const wxString& strArg = wxEmptyString);
// event handlers
const wxString& strArg = wxEmptyString);
// event handlers
- void OnKey(wx
Command
Event& event);
+ void OnKey(wx
Key
Event& event);
// common part of all ctors
void Init();
// common part of all ctors
void Init();
@@
-270,6
+270,8
@@
public:
virtual void Select(int n);
virtual int GetSelection() const;
void SetSelection(int n) { Select(n); }
virtual void Select(int n);
virtual int GetSelection() const;
void SetSelection(int n) { Select(n); }
+
+ void SetStringSelection(const wxString& s) { }
protected:
virtual int DoAppend(const wxString& item);
protected:
virtual int DoAppend(const wxString& item);
@@
-301,7
+303,7
@@
class WXDLLEXPORT wxStdComboBoxInputHandler : public wxStdInputHandler
public:
wxStdComboBoxInputHandler(wxInputHandler *inphand);
public:
wxStdComboBoxInputHandler(wxInputHandler *inphand);
- virtual bool HandleKey(wx
Control *control
,
+ virtual bool HandleKey(wx
InputConsumer *consumer
,
const wxKeyEvent& event,
bool pressed);
};
const wxKeyEvent& event,
bool pressed);
};