Fix bugs in wxEnumProperty introduced by r76562.
The compilation fixes introduced run-time fixes due to not account for the use of NULL pointers (which are not accepted as choices cache but are accepted as choices values, go figure). Closes #16266. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1683,13 +1683,15 @@ static const long gs_cp_es_syscursors_values[NUM_CURSORS] = {
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCursorProperty, wxEnumProperty)
|
||||
|
||||
static wxPGChoices gs_wxCursorProperty_choicesCache;
|
||||
|
||||
wxCursorProperty::wxCursorProperty( const wxString& label, const wxString& name,
|
||||
int value )
|
||||
: wxEnumProperty( label,
|
||||
name,
|
||||
gs_cp_es_syscursors_labels,
|
||||
gs_cp_es_syscursors_values,
|
||||
NULL,
|
||||
&gs_wxCursorProperty_choicesCache,
|
||||
value )
|
||||
{
|
||||
m_flags |= wxPG_PROP_STATIC_CHOICES; // Cursor selection cannot be changed.
|
||||
|
Reference in New Issue
Block a user