diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp index 6d4f637fdb..b1c77b1ae6 100644 --- a/src/aui/dockart.cpp +++ b/src/aui/dockart.cpp @@ -683,8 +683,6 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window), wxAuiPaneInfo& pane) { wxBitmap bmp; - if (!(&pane)) - return; switch (button) { default: diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp index 1ec3f7349c..af2f341fd7 100644 --- a/src/propgrid/advprops.cpp +++ b/src/propgrid/advprops.cpp @@ -947,10 +947,7 @@ wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxS gs_cp_es_syscolour_values, &gs_wxSystemColourProperty_choicesCache ) { - if ( &value ) Init( value.m_type, value.m_colour ); - else - Init( wxPG_COLOUR_CUSTOM, *wxWHITE ); } @@ -959,10 +956,7 @@ wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxS const wxColourPropertyValue& value ) : wxEnumProperty( label, name, labels, values, choicesCache ) { - if ( &value ) Init( value.m_type, value.m_colour ); - else - Init( wxPG_COLOUR_CUSTOM, *wxWHITE ); } @@ -971,10 +965,7 @@ wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxS const wxColour& value ) : wxEnumProperty( label, name, labels, values, choicesCache ) { - if ( &value ) Init( wxPG_COLOUR_CUSTOM, value ); - else - Init( wxPG_COLOUR_CUSTOM, *wxWHITE ); } @@ -2063,7 +2054,7 @@ wxArrayInt wxMultiChoiceProperty::GetValueAsIndices() const // Translate values to string indices. wxArrayInt selections; - if ( !m_choices.IsOk() || !m_choices.GetCount() || !(&valueArr) ) + if ( !m_choices.IsOk() || !m_choices.GetCount() ) { for ( i=0; iGetImageSize(); @@ -3043,7 +3043,7 @@ wxArrayString wxPGChoices::GetLabels() const { wxArrayString arr; - if ( this && IsOk() ) + if ( IsOk() ) for ( unsigned int i = 0; i < GetCount(); i++ ) arr.push_back(GetLabel(i)); diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index 371c2f50ed..0ca183301c 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -1201,7 +1201,7 @@ wxEnumProperty::wxEnumProperty( const wxString& label, const wxString& name, { SetIndex(0); - if ( &labels && !labels.empty() ) + if ( !labels.empty() ) { m_choices.Set(labels, values); @@ -1590,7 +1590,7 @@ wxFlagsProperty::wxFlagsProperty( const wxString& label, const wxString& name, { m_oldChoicesData = NULL; - if ( &labels && !labels.empty() ) + if ( !labels.empty() ) { m_choices.Set(labels,values);