compilation fix after wxScrollHelper changes (ctor argument is now not optional and SetWin doesn't exist any more)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,7 +52,7 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// ctors and such
|
// ctors and such
|
||||||
wxListBox() { Init(); }
|
wxListBox() : wxScrollHelper(this) { Init(); }
|
||||||
wxListBox(wxWindow *parent,
|
wxListBox(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@@ -61,6 +61,7 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxListBoxNameStr )
|
const wxString& name = wxListBoxNameStr )
|
||||||
|
: wxScrollHelper(this)
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
|
|
||||||
|
@@ -84,6 +84,7 @@ wxListBox::wxListBox(wxWindow *parent,
|
|||||||
long style,
|
long style,
|
||||||
const wxValidator& validator,
|
const wxValidator& validator,
|
||||||
const wxString &name)
|
const wxString &name)
|
||||||
|
:wxScrollHelper(this)
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
|
|
||||||
@@ -135,8 +136,6 @@ bool wxListBox::Create(wxWindow *parent,
|
|||||||
validator, name) )
|
validator, name) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
SetWindow(this);
|
|
||||||
|
|
||||||
m_strings = new wxArrayString;
|
m_strings = new wxArrayString;
|
||||||
|
|
||||||
Set(n, choices);
|
Set(n, choices);
|
||||||
|
Reference in New Issue
Block a user