From 002ceb3840434a6bb0d52b3e97ef3fd95fa5bd60 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Sep 2005 21:01:39 +0000 Subject: [PATCH 1/1] tremoved unused variable git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/motif/evtloop.cpp | 11 +++++------ src/motif/radiobut.cpp | 13 +++++-------- src/motif/toolbar.cpp | 3 --- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp index d92da8a1eb..f0dd4fdfe7 100644 --- a/src/motif/evtloop.cpp +++ b/src/motif/evtloop.cpp @@ -387,7 +387,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop ) #include #include -static XtInputId inputId; static int idleFds[2] = { -1, -1 }; class wxIdlePipeModule : public wxModule @@ -478,11 +477,11 @@ bool wxAddIdleCallback() return false; // install input handler for wxWakeUpIdle - inputId = XtAppAddInput( (XtAppContext) wxTheApp->GetAppContext(), - idleFds[0], - (XtPointer)XtInputReadMask, - wxInputCallback, - NULL ); + XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(), + idleFds[0], + (XtPointer)XtInputReadMask, + wxInputCallback, + NULL); return true; } diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index e45879d473..05b2bfceaa 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -90,7 +90,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, //copied from mac/radiobut.cpp (from here till "return true;") m_cycle = this ; - + if (HasFlag(wxRB_GROUP)) { AddInCycle( NULL ) ; @@ -181,23 +181,20 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData, wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle) { - wxRadioButton* next; - wxRadioButton* current; - if (cycle == NULL) { m_cycle = this; - return this; } else { - current = cycle; - while ((next = current->m_cycle) != cycle) + wxRadioButton* current = cycle; + while ( current->m_cycle != cycle ) current = current->m_cycle; m_cycle = cycle; current->m_cycle = this; - return cycle; } + + return cycle; } wxRadioButton* wxRadioButton::ClearSelections() diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp index 61640318f5..4c685aada7 100644 --- a/src/motif/toolbar.cpp +++ b/src/motif/toolbar.cpp @@ -276,8 +276,6 @@ bool wxToolBar::Realize() int buttonHeight = 0, buttonWidth = 0; - int currentSpacing = 0; - Widget button; Pixmap pixmap, insensPixmap; wxBitmap bmp, insensBmp; @@ -470,7 +468,6 @@ bool wxToolBar::Realize() XtAddEventHandler (button, EnterWindowMask | LeaveWindowMask, False, wxToolButtonPopupCallback, (XtPointer) this); - currentSpacing = 0; break; } -- 2.45.2