From f9e00f46a62485c09f3500cb95272d66395ddc02 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 29 Jun 2014 23:42:38 +0000 Subject: [PATCH] No real changes, just fix a harmless warning under OS X. Don't use "size" variable unnecessarily under non-Mac platforms, this also fixes a warning about reassigning it immediately after assigning a previous values to it under Mac. Closes #16353. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/datavcmn.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 9d68261fe0..bf0a880d07 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -1461,14 +1461,13 @@ wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCell wxWindow* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { long l = value; - wxSize size = labelRect.GetSize(); #ifdef __WXMAC__ - size = wxSize( wxMax(70,labelRect.width ), -1 ); + wxSize size = wxSize( wxMax(70,labelRect.width ), -1 ); #endif wxString str; str.Printf( wxT("%d"), (int) l ); wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str, - labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l ); + labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l ); #ifdef __WXMAC__ size = sc->GetSize(); wxPoint pt = sc->GetPosition();