tremoved unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -387,7 +387,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop )
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
static XtInputId inputId;
|
|
||||||
static int idleFds[2] = { -1, -1 };
|
static int idleFds[2] = { -1, -1 };
|
||||||
|
|
||||||
class wxIdlePipeModule : public wxModule
|
class wxIdlePipeModule : public wxModule
|
||||||
@@ -478,11 +477,11 @@ bool wxAddIdleCallback()
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// install input handler for wxWakeUpIdle
|
// install input handler for wxWakeUpIdle
|
||||||
inputId = XtAppAddInput( (XtAppContext) wxTheApp->GetAppContext(),
|
XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
|
||||||
idleFds[0],
|
idleFds[0],
|
||||||
(XtPointer)XtInputReadMask,
|
(XtPointer)XtInputReadMask,
|
||||||
wxInputCallback,
|
wxInputCallback,
|
||||||
NULL );
|
NULL);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@@ -90,7 +90,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
//copied from mac/radiobut.cpp (from here till "return true;")
|
//copied from mac/radiobut.cpp (from here till "return true;")
|
||||||
m_cycle = this ;
|
m_cycle = this ;
|
||||||
|
|
||||||
if (HasFlag(wxRB_GROUP))
|
if (HasFlag(wxRB_GROUP))
|
||||||
{
|
{
|
||||||
AddInCycle( NULL ) ;
|
AddInCycle( NULL ) ;
|
||||||
@@ -181,23 +181,20 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData,
|
|||||||
|
|
||||||
wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle)
|
wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle)
|
||||||
{
|
{
|
||||||
wxRadioButton* next;
|
|
||||||
wxRadioButton* current;
|
|
||||||
|
|
||||||
if (cycle == NULL)
|
if (cycle == NULL)
|
||||||
{
|
{
|
||||||
m_cycle = this;
|
m_cycle = this;
|
||||||
return this;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
current = cycle;
|
wxRadioButton* current = cycle;
|
||||||
while ((next = current->m_cycle) != cycle)
|
while ( current->m_cycle != cycle )
|
||||||
current = current->m_cycle;
|
current = current->m_cycle;
|
||||||
m_cycle = cycle;
|
m_cycle = cycle;
|
||||||
current->m_cycle = this;
|
current->m_cycle = this;
|
||||||
return cycle;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return cycle;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxRadioButton* wxRadioButton::ClearSelections()
|
wxRadioButton* wxRadioButton::ClearSelections()
|
||||||
|
@@ -276,8 +276,6 @@ bool wxToolBar::Realize()
|
|||||||
|
|
||||||
int buttonHeight = 0, buttonWidth = 0;
|
int buttonHeight = 0, buttonWidth = 0;
|
||||||
|
|
||||||
int currentSpacing = 0;
|
|
||||||
|
|
||||||
Widget button;
|
Widget button;
|
||||||
Pixmap pixmap, insensPixmap;
|
Pixmap pixmap, insensPixmap;
|
||||||
wxBitmap bmp, insensBmp;
|
wxBitmap bmp, insensBmp;
|
||||||
@@ -470,7 +468,6 @@ bool wxToolBar::Realize()
|
|||||||
XtAddEventHandler (button, EnterWindowMask | LeaveWindowMask,
|
XtAddEventHandler (button, EnterWindowMask | LeaveWindowMask,
|
||||||
False, wxToolButtonPopupCallback, (XtPointer) this);
|
False, wxToolButtonPopupCallback, (XtPointer) this);
|
||||||
|
|
||||||
currentSpacing = 0;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user