Update of /cvsroot/audacity/audacity-src/src/widgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1697
Modified Files:
Ruler.cpp Ruler.h
Log Message:
Remove unneeded variable (thanks, Simone)
Index: Ruler.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Ruler.h 18 Feb 2009 06:38:12 -0000 1.29
+++ Ruler.h 19 Feb 2009 23:48:03 -0000 1.30
@@ -201,8 +201,7 @@
bool mbMinor;
bool mMajorGrid; // for grid drawing
bool mMinorGrid; // .
- int mGridLineLength; // .
- int mZeroPosition; // end
+ int mGridLineLength; // end
wxString mUnits;
};
Index: Ruler.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Ruler.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Ruler.cpp 19 Feb 2009 00:02:10 -0000 1.58
+++ Ruler.cpp 19 Feb 2009 23:48:03 -0000 1.59
@@ -142,8 +142,6 @@
mGridLineLength = 0;
mMajorGrid = false;
mMinorGrid = false;
-
- mZeroPosition = -1;
}
Ruler::~Ruler()
@@ -1402,17 +1400,17 @@
}
}
- GetZeroPosition();
- if(mZeroPosition > 0) {
+ int zeroPosition = GetZeroPosition();
+ if(zeroPosition > 0) {
// Draw 'zero' grid line in black
mDC->SetPen(*wxBLACK_PEN);
if(mOrientation == wxHORIZONTAL) {
- if(mZeroPosition != mGridLineLength)
- mDC->DrawLine(mZeroPosition+1, 1, mZeroPosition+1,
mGridLineLength);
+ if(zeroPosition != mGridLineLength)
+ mDC->DrawLine(zeroPosition+1, 1, zeroPosition+1,
mGridLineLength);
}
else {
- if(mZeroPosition != mGridLineLength)
- mDC->DrawLine(1, mZeroPosition+1, mGridLineLength,
mZeroPosition+1);
+ if(zeroPosition != mGridLineLength)
+ mDC->DrawLine(1, zeroPosition+1, mGridLineLength,
zeroPosition+1);
}
}
}
@@ -1434,9 +1432,9 @@
} while( (i < len) && (d != 0.0) );
if(d == 0.0)
- return (mZeroPosition = label[i - 1].pos) ;
+ return (label[i - 1].pos) ;
else
- return mZeroPosition = -1;
+ return -1;
}
int Ruler::GetZeroPosition()
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
