]> git.saurik.com Git - wxWidgets.git/commitdiff
tremoved unused variable
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 17 Sep 2005 21:01:39 +0000 (21:01 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 17 Sep 2005 21:01:39 +0000 (21:01 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/motif/evtloop.cpp
src/motif/radiobut.cpp
src/motif/toolbar.cpp

index d92da8a1eb9dd6adfe9f82741d0766487e6c6792..f0dd4fdfe73b6e5057f38d1eb562e1cd2dd1b2c2 100644 (file)
@@ -387,7 +387,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop )
 #include <sys/time.h>
 #include <unistd.h>
 
-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;
 }
index e45879d47380af086ab3301c6acc397d12bb960e..05b2bfceaac3290b7a1045d2ccdd5b6cb11be6d1 100644 (file)
@@ -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()
index 61640318f537370eb64c5bf0de86f7a1ff8f94a6..4c685aada7802729bd7cc2700f647ff5173f44ab 100644 (file)
@@ -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;
         }