From 616c7cbd92e7b6f6510cc7169fad8856e0e1397c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 16 Mar 2011 07:16:10 +0000 Subject: [PATCH] replace usage of objective-c keyword 'id' git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 207a8899b1..932a824ed7 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -7733,11 +7733,11 @@ bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet) { wxRichTextStyleSheet* oldSheet = GetStyleSheet(); - wxWindowID id = wxID_ANY; + wxWindowID winid = wxID_ANY; if (GetRichTextCtrl()) - id = GetRichTextCtrl()->GetId(); + winid = GetRichTextCtrl()->GetId(); - wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id); + wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, winid); event.SetEventObject(GetRichTextCtrl()); event.SetContainer(GetRichTextCtrl()->GetFocusObject()); event.SetOldStyleSheet(oldSheet); -- 2.45.2