projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxFrameNameStr was already delivered by #include one line earlier.
[wxWidgets.git]
/
include
/
wx
/
univ
/
combobox.h
diff --git
a/include/wx/univ/combobox.h
b/include/wx/univ/combobox.h
index 4d3a70b50316153e440940baf6368147010b7f83..9230e4dbe05f3103fd566578373dae49de340f07 100644
(file)
--- a/
include/wx/univ/combobox.h
+++ b/
include/wx/univ/combobox.h
@@
-66,6
+66,7
@@
class WXDLLEXPORT wxComboPopup
{
public:
wxComboPopup(wxComboControl *combo) { m_combo = combo; }
{
public:
wxComboPopup(wxComboControl *combo) { m_combo = combo; }
+ virtual ~wxComboPopup() {}
// we must have an associated control which is subclassed by the combobox
virtual wxControl *GetControl() = 0;
// we must have an associated control which is subclassed by the combobox
virtual wxControl *GetControl() = 0;
@@
-162,6
+163,11
@@
public:
virtual void DoSetToolTip( wxToolTip *tip );
#endif // wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip );
#endif // wxUSE_TOOLTIPS
+ // we have our own input handler and our own actions
+ virtual bool PerformAction(const wxControlAction& action,
+ long numArg = 0l,
+ const wxString& strArg = wxEmptyString);
+
protected:
// override the base class virtuals involved into geometry calculations
virtual wxSize DoGetBestClientSize() const;
protected:
// override the base class virtuals involved into geometry calculations
virtual wxSize DoGetBestClientSize() const;
@@
-170,11
+176,6
@@
protected:
int width, int height,
int sizeFlags = wxSIZE_AUTO);
int width, int height,
int sizeFlags = wxSIZE_AUTO);
- // we have our own input handler and our own actions
- virtual bool PerformAction(const wxControlAction& action,
- long numArg = 0l,
- const wxString& strArg = wxEmptyString);
-
// event handlers
void OnKey(wxKeyEvent& event);
// event handlers
void OnKey(wxKeyEvent& event);
@@
-293,10
+294,10
@@
public:
// wxControlWithItems methods
virtual void Clear();
virtual void Delete(int n);
// wxControlWithItems methods
virtual void Clear();
virtual void Delete(int n);
- virtual
in
t GetCount() const;
+ virtual
size_
t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& s);
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& s);
- virtual int FindString(const wxString& s) const;
+ virtual int FindString(const wxString& s
, bool bCase = false
) const;
virtual void SetSelection(int n);
virtual int GetSelection() const;
virtual void SetSelection(int n);
virtual int GetSelection() const;