diff --git a/OCCalendarView/OCCalendarView.h b/OCCalendarView/OCCalendarView.h old mode 100644 new mode 100755 diff --git a/OCCalendarView/OCCalendarView.m b/OCCalendarView/OCCalendarView.m old mode 100644 new mode 100755 index 3cde2e9..524fe35 --- a/OCCalendarView/OCCalendarView.m +++ b/OCCalendarView/OCCalendarView.m @@ -38,12 +38,12 @@ - (id)initAtPoint:(CGPoint)p withFrame:(CGRect)frame arrowPosition:(OCArrowPosit if(self) { self.backgroundColor = [UIColor clearColor]; - calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; + calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; - NSUInteger unitFlags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit; + NSUInteger unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay; NSDateComponents *dateParts = [calendar components:unitFlags fromDate:[NSDate date]]; - currentMonth = [dateParts month]; - currentYear = [dateParts year]; + currentMonth = (int)[dateParts month]; + currentYear = (int)[dateParts year]; arrowPosition = arrowPos; startCellX = -1; @@ -167,12 +167,11 @@ - (NSDate *)getStartDate { [dateParts setYear:year]; [dateParts setDay:1]; NSDate *dateOnFirst = [calendar dateFromComponents:dateParts]; - [dateParts release]; - NSDateComponents *weekdayComponents = [calendar components:NSWeekdayCalendarUnit fromDate:dateOnFirst]; - int weekdayOfFirst = [weekdayComponents weekday]; + NSDateComponents *weekdayComponents = [calendar components:NSCalendarUnitWeekday fromDate:dateOnFirst]; + int weekdayOfFirst = (int)[weekdayComponents weekday]; - int numDaysInMonth = [calendar rangeOfUnit:NSDayCalendarUnit - inUnit:NSMonthCalendarUnit + int numDaysInMonth = (int)[calendar rangeOfUnit:NSCalendarUnitDay + inUnit:NSCalendarUnitMonth forDate:dateOnFirst].length; if(startPoint.y == 0 && startPoint.x+1 < weekdayOfFirst) { @@ -198,7 +197,7 @@ - (NSDate *)getStartDate { } } - NSDateComponents *comps = [[[NSDateComponents alloc] init] autorelease]; + NSDateComponents *comps = [[NSDateComponents alloc] init]; [comps setDay:day]; [comps setMonth:month]; [comps setYear:year]; @@ -224,12 +223,11 @@ - (NSDate *)getEndDate { [dateParts setYear:year]; [dateParts setDay:1]; NSDate *dateOnFirst = [calendar dateFromComponents:dateParts]; - [dateParts release]; - NSDateComponents *weekdayComponents = [calendar components:NSWeekdayCalendarUnit fromDate:dateOnFirst]; - int weekdayOfFirst = [weekdayComponents weekday]; + NSDateComponents *weekdayComponents = [calendar components:NSCalendarUnitWeekday fromDate:dateOnFirst]; + int weekdayOfFirst = (int)[weekdayComponents weekday]; - int numDaysInMonth = [calendar rangeOfUnit:NSDayCalendarUnit - inUnit:NSMonthCalendarUnit + int numDaysInMonth = (int)[calendar rangeOfUnit:NSCalendarUnitDay + inUnit:NSCalendarUnitMonth forDate:dateOnFirst].length; if(endPoint.y == 0 && endPoint.x+1 < weekdayOfFirst) { day = endPoint.x - weekdayOfFirst + 2; @@ -256,7 +254,7 @@ - (NSDate *)getEndDate { } } - NSDateComponents *comps = [[[NSDateComponents alloc] init] autorelease]; + NSDateComponents *comps = [[NSDateComponents alloc] init]; [comps setDay:day]; [comps setMonth:month]; [comps setYear:year]; @@ -268,13 +266,13 @@ - (NSDate *)getEndDate { - (void)setStartDate:(NSDate *)sDate { //NSLog(@"setStartDate"); - NSDateComponents *sComponents = [[NSCalendar currentCalendar] components:NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit fromDate:sDate]; + NSDateComponents *sComponents = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:sDate]; if([sComponents month] != currentMonth) { - currentMonth = [sComponents month]; + currentMonth = (int)[sComponents month]; } if([sComponents year] != currentYear) { - currentYear = [sComponents year]; + currentYear = (int)[sComponents year]; } int day = 1; int month = currentMonth; @@ -286,12 +284,11 @@ - (void)setStartDate:(NSDate *)sDate { [dateParts setYear:year]; [dateParts setDay:1]; NSDate *dateOnFirst = [calendar dateFromComponents:dateParts]; - [dateParts release]; - NSDateComponents *weekdayComponents = [calendar components:NSWeekdayCalendarUnit fromDate:dateOnFirst]; - int weekdayOfFirst = [weekdayComponents weekday]; + NSDateComponents *weekdayComponents = [calendar components:NSCalendarUnitWeekday fromDate:dateOnFirst]; + int weekdayOfFirst = (int)[weekdayComponents weekday]; - int numDaysInMonth = [calendar rangeOfUnit:NSDayCalendarUnit - inUnit:NSMonthCalendarUnit + int numDaysInMonth = (int)[calendar rangeOfUnit:NSCalendarUnitDay + inUnit:NSCalendarUnitMonth forDate:dateOnFirst].length; BOOL breakLoop = NO; @@ -322,13 +319,13 @@ - (void)setStartDate:(NSDate *)sDate { - (void)setEndDate:(NSDate *)eDate { //NSLog(@"setEndDate"); - NSDateComponents *eComponents = [[NSCalendar currentCalendar] components:NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit fromDate:eDate]; + NSDateComponents *eComponents = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:eDate]; if([eComponents month] != currentMonth) { - currentMonth = [eComponents month]; + currentMonth = (int)[eComponents month]; } if([eComponents year] != currentYear) { - currentYear = [eComponents year]; + currentYear = (int)[eComponents year]; } int day = 1; int month = currentMonth; @@ -340,12 +337,11 @@ - (void)setEndDate:(NSDate *)eDate { [dateParts setYear:year]; [dateParts setDay:1]; NSDate *dateOnFirst = [calendar dateFromComponents:dateParts]; - [dateParts release]; - NSDateComponents *weekdayComponents = [calendar components:NSWeekdayCalendarUnit fromDate:dateOnFirst]; - int weekdayOfFirst = [weekdayComponents weekday]; + NSDateComponents *weekdayComponents = [calendar components:NSCalendarUnitWeekday fromDate:dateOnFirst]; + int weekdayOfFirst = (int)[weekdayComponents weekday]; - int numDaysInMonth = [calendar rangeOfUnit:NSDayCalendarUnit - inUnit:NSMonthCalendarUnit + int numDaysInMonth = (int)[calendar rangeOfUnit:NSCalendarUnitDay + inUnit:NSCalendarUnitMonth forDate:dateOnFirst].length; BOOL breakLoop = NO; @@ -608,7 +604,16 @@ -(void) renderCalendarViewForPhone CGContextSetShadowWithColor(context, shadow2Offset, shadow2BlurRadius, shadow2); CGRect dayHeaderFrame = CGRectMake(63+i*hDiff, 75, 30, 14); [[UIColor whiteColor] setFill]; - [((NSString *)[dayTitles objectAtIndex:i]) drawInRect: dayHeaderFrame withFont: [UIFont fontWithName: @"Helvetica" size: 12] lineBreakMode: UILineBreakModeWordWrap alignment: UITextAlignmentCenter]; + UIFont *font = [UIFont fontWithName:@"Helvetica" size:12.0]; + NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping; + paragraphStyle.alignment = NSTextAlignmentCenter; + NSDictionary *attrsDictionary = @{NSParagraphStyleAttributeName : paragraphStyle, + NSFontAttributeName : font, + NSForegroundColorAttributeName : [UIColor whiteColor]}; + + [((NSString *)[dayTitles objectAtIndex:i]) drawAtPoint:dayHeaderFrame.origin withAttributes:attrsDictionary]; + CGContextRestoreGState(context); } @@ -622,7 +627,15 @@ -(void) renderCalendarViewForPhone CGContextSetShadowWithColor(context, shadow2Offset, shadow2BlurRadius, shadow2); CGRect textFrame = CGRectMake(94, 53, 220, 18); [[UIColor whiteColor] setFill]; - [monthTitle drawInRect: textFrame withFont: [UIFont fontWithName: @"Helvetica" size: 12] lineBreakMode: UILineBreakModeWordWrap alignment: UITextAlignmentCenter]; + UIFont *font = [UIFont fontWithName:@"Helvetica" size:12.0]; + NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping; + paragraphStyle.alignment = NSTextAlignmentCenter; + NSDictionary *attrsDictionary = @{NSParagraphStyleAttributeName : paragraphStyle, + NSFontAttributeName : font, + NSForegroundColorAttributeName : [UIColor whiteColor]}; + + [monthTitle drawAtPoint:textFrame.origin withAttributes:attrsDictionary]; CGContextRestoreGState(context); //// backArrow Drawing @@ -827,7 +840,15 @@ -(void) renderCalendarViewForPad CGContextSetShadowWithColor(context, shadow2Offset, shadow2BlurRadius, shadow2); CGRect dayHeaderFrame = CGRectMake(60+i*hDiff, 75, 30, 14); [[UIColor whiteColor] setFill]; - [((NSString *)[dayTitles objectAtIndex:i]) drawInRect: dayHeaderFrame withFont: [UIFont fontWithName: @"Helvetica" size: 12] lineBreakMode: UILineBreakModeWordWrap alignment: UITextAlignmentCenter]; + UIFont *font = [UIFont fontWithName:@"Helvetica" size:12.0]; + NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping; + paragraphStyle.alignment = NSTextAlignmentCenter; + NSDictionary *attrsDictionary = @{NSParagraphStyleAttributeName : paragraphStyle, + NSFontAttributeName : font, + NSForegroundColorAttributeName : [UIColor whiteColor]}; + + [((NSString *)[dayTitles objectAtIndex:i]) drawAtPoint:dayHeaderFrame.origin withAttributes:attrsDictionary]; CGContextRestoreGState(context); } @@ -841,7 +862,15 @@ -(void) renderCalendarViewForPad CGContextSetShadowWithColor(context, shadow2Offset, shadow2BlurRadius, shadow2); CGRect textFrame = CGRectMake(94, 53, 220, 18); [[UIColor whiteColor] setFill]; - [monthTitle drawInRect: textFrame withFont: [UIFont fontWithName: @"Helvetica" size: 12] lineBreakMode: UILineBreakModeWordWrap alignment: UITextAlignmentCenter]; + UIFont *font = [UIFont fontWithName:@"Helvetica" size:12.0]; + NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping; + paragraphStyle.alignment = NSTextAlignmentCenter; + NSDictionary *attrsDictionary = @{NSParagraphStyleAttributeName : paragraphStyle, + NSFontAttributeName : font, + NSForegroundColorAttributeName : [UIColor whiteColor]}; + + [monthTitle drawAtPoint:textFrame.origin withAttributes:attrsDictionary]; CGContextRestoreGState(context); //// backArrow Drawing @@ -871,14 +900,4 @@ -(void) renderCalendarViewForPad } - -- (void)dealloc { - - [selectionView release]; - [calendar release]; - - [super dealloc]; - -} - @end diff --git a/OCCalendarView/OCCalendarViewController.h b/OCCalendarView/OCCalendarViewController.h old mode 100644 new mode 100755 index c43a002..0ad4591 --- a/OCCalendarView/OCCalendarViewController.h +++ b/OCCalendarView/OCCalendarViewController.h @@ -20,7 +20,7 @@ @end @interface OCCalendarViewController : UIViewController { - id delegate; + id calendarDelegate; UILabel *toolTipLabel; OCCalendarView *calView; diff --git a/OCCalendarView/OCCalendarViewController.m b/OCCalendarView/OCCalendarViewController.m old mode 100644 new mode 100755 index 1a85d97..1b26636 --- a/OCCalendarView/OCCalendarViewController.m +++ b/OCCalendarView/OCCalendarViewController.m @@ -45,10 +45,10 @@ - (void)loadView { bgView.backgroundColor = [UIColor clearColor]; UITapGestureRecognizer *tapG = [[UITapGestureRecognizer alloc] init]; tapG.delegate = self; - [bgView addGestureRecognizer:[tapG autorelease]]; + [bgView addGestureRecognizer:tapG]; [bgView setUserInteractionEnabled:YES]; - [self.view addSubview:[bgView autorelease]]; + [self.view addSubview:bgView]; int width = 390; int height = 300; @@ -69,7 +69,7 @@ - (void)loadView { if(self.endDate) { [calView setEndDate:endDate]; } - [self.view addSubview:[calView autorelease]]; + [self.view addSubview:calView]; } - (void)viewDidAppear:(BOOL)animated { @@ -78,25 +78,22 @@ - (void)viewDidAppear:(BOOL)animated { - (void)setStartDate:(NSDate *)sDate { if(startDate) { - [startDate release]; startDate = nil; } - startDate = [sDate retain]; [calView setStartDate:startDate]; } - (void)setEndDate:(NSDate *)eDate { if(endDate) { - [endDate release]; endDate = nil; } - endDate = [eDate retain]; + endDate = eDate; [calView setEndDate:endDate]; } - (void)removeCalView { - startDate = [[calView getStartDate] retain]; - endDate = [[calView getEndDate] retain]; + startDate = [calView getStartDate]; + endDate = [calView getEndDate]; //NSLog(@"startDate:%@ endDate:%@", startDate.description, endDate.description); @@ -134,7 +131,7 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceive int height = 300; calView = [[OCCalendarView alloc] initAtPoint:point withFrame:CGRectMake(point.x - width*0.5, point.y - 31.4, width, height)]; - [self.view addSubview:[calView autorelease]]; + [self.view addSubview:calView]; } return YES; @@ -145,10 +142,4 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface return YES; } -- (void)dealloc { - self.startDate = nil; - self.endDate = nil; - [super dealloc]; -} - @end diff --git a/OCCalendarView/OCDaysView.h b/OCCalendarView/OCDaysView.h old mode 100644 new mode 100755 diff --git a/OCCalendarView/OCDaysView.m b/OCCalendarView/OCDaysView.m old mode 100644 new mode 100755 index 5649870..f0e05ad --- a/OCCalendarView/OCDaysView.m +++ b/OCCalendarView/OCDaysView.m @@ -39,7 +39,7 @@ - (void)drawRect:(CGRect)rect CGFloat shadow2BlurRadius = 1; CGColorRef shadow2 = [UIColor blackColor].CGColor; - NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; + NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; int month = currentMonth; int year = currentYear; @@ -50,14 +50,13 @@ - (void)drawRect:(CGRect)rect [dateParts setYear:year]; [dateParts setDay:1]; NSDate *dateOnFirst = [calendar dateFromComponents:dateParts]; - [dateParts release]; - NSDateComponents *weekdayComponents = [calendar components:NSWeekdayCalendarUnit fromDate:dateOnFirst]; - int weekdayOfFirst = [weekdayComponents weekday]; + NSDateComponents *weekdayComponents = [calendar components:NSCalendarUnitWeekday fromDate:dateOnFirst]; + int weekdayOfFirst = (int)[weekdayComponents weekday]; //NSLog(@"weekdayOfFirst:%d", weekdayOfFirst); - int numDaysInMonth = [calendar rangeOfUnit:NSDayCalendarUnit - inUnit:NSMonthCalendarUnit + int numDaysInMonth = (int)[calendar rangeOfUnit:NSCalendarUnitDay + inUnit:NSCalendarUnitMonth forDate:dateOnFirst].length; //NSLog(@"month:%d, numDaysInMonth:%d", currentMonth, numDaysInMonth); @@ -75,14 +74,12 @@ - (void)drawRect:(CGRect)rect [prevDateParts setDay:1]; NSDate *prevDateOnFirst = [calendar dateFromComponents:prevDateParts]; - - [prevDateParts release]; - - int numDaysInPrevMonth = [calendar rangeOfUnit:NSDayCalendarUnit - inUnit:NSMonthCalendarUnit + + int numDaysInPrevMonth = (int)[calendar rangeOfUnit:NSCalendarUnitDay + inUnit:NSCalendarUnitMonth forDate:prevDateOnFirst].length; - NSDateComponents *today = [[NSCalendar currentCalendar] components:NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit fromDate:[NSDate date]]; + NSDateComponents *today = [[NSCalendar currentCalendar] components:NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear fromDate:[NSDate date]]; //Draw the text for each of those days. for(int i = 0; i <= weekdayOfFirst-2; i++) { @@ -90,13 +87,20 @@ - (void)drawRect:(CGRect)rect NSString *str = [NSString stringWithFormat:@"%d", day]; - - CGContextSaveGState(context); CGContextSetShadowWithColor(context, shadow2Offset, shadow2BlurRadius, shadow2); CGRect dayHeader2Frame = CGRectMake((i)*hDiff, 0, 21, 14); [[UIColor colorWithWhite:0.6f alpha:1.0f] setFill]; - [str drawInRect: dayHeader2Frame withFont: [UIFont fontWithName: @"Helvetica" size: 12] lineBreakMode: UILineBreakModeWordWrap alignment: UITextAlignmentCenter]; + + UIFont *font = [UIFont fontWithName:@"Helvetica" size:12.0]; + NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping; + paragraphStyle.alignment = NSTextAlignmentCenter; + NSDictionary *attrsDictionary = @{NSParagraphStyleAttributeName : paragraphStyle, + NSFontAttributeName : font, + NSForegroundColorAttributeName : [UIColor whiteColor]}; + + [str drawAtPoint:dayHeader2Frame.origin withAttributes:attrsDictionary]; CGContextRestoreGState(context); } @@ -119,7 +123,16 @@ - (void)drawRect:(CGRect)rect } else { [[UIColor whiteColor] setFill]; } - [str drawInRect: dayHeader2Frame withFont: [UIFont fontWithName: @"Helvetica" size: 12] lineBreakMode: UILineBreakModeWordWrap alignment: UITextAlignmentCenter]; + UIFont *font = [UIFont fontWithName:@"Helvetica" size:12.0]; + NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping; + paragraphStyle.alignment = NSTextAlignmentCenter; + NSDictionary *attrsDictionary = @{NSParagraphStyleAttributeName : paragraphStyle, + NSFontAttributeName : font, + NSForegroundColorAttributeName : [UIColor whiteColor]}; + + [str drawAtPoint:dayHeader2Frame.origin withAttributes:attrsDictionary]; + CGContextRestoreGState(context); finalRow = i; @@ -145,11 +158,8 @@ - (void)drawRect:(CGRect)rect [nextDateParts setDay:1]; NSDate *nextDateOnFirst = [calendar dateFromComponents:nextDateParts]; - - [nextDateParts release]; - - NSDateComponents *nextWeekdayComponents = [calendar components:NSWeekdayCalendarUnit fromDate:nextDateOnFirst]; - int weekdayOfNextFirst = [nextWeekdayComponents weekday]; + NSDateComponents *nextWeekdayComponents = [calendar components:NSCalendarUnitWeekday fromDate:nextDateOnFirst]; + int weekdayOfNextFirst = (int)[nextWeekdayComponents weekday]; if(!endedOnSat) { //Draw the text for each of those days. @@ -162,7 +172,16 @@ - (void)drawRect:(CGRect)rect CGContextSetShadowWithColor(context, shadow2Offset, shadow2BlurRadius, shadow2); CGRect dayHeader2Frame = CGRectMake((i)*hDiff, finalRow * vDiff, 21, 14); [[UIColor colorWithWhite:0.6f alpha:1.0f] setFill]; - [str drawInRect: dayHeader2Frame withFont: [UIFont fontWithName: @"Helvetica" size: 12] lineBreakMode: UILineBreakModeWordWrap alignment: UITextAlignmentCenter]; + UIFont *font = [UIFont fontWithName:@"Helvetica" size:12.0]; + NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping; + paragraphStyle.alignment = NSTextAlignmentCenter; + NSDictionary *attrsDictionary = @{NSParagraphStyleAttributeName : paragraphStyle, + NSFontAttributeName : font, + NSForegroundColorAttributeName : [UIColor whiteColor]}; + + [str drawAtPoint:dayHeader2Frame.origin withAttributes:attrsDictionary]; + CGContextRestoreGState(context); } } @@ -179,7 +198,7 @@ - (void)setYear:(int)year { } - (void)resetRows { - NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; + NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; int month = currentMonth; int year = currentYear; @@ -190,12 +209,11 @@ - (void)resetRows { [dateParts setYear:year]; [dateParts setDay:1]; NSDate *dateOnFirst = [calendar dateFromComponents:dateParts]; - [dateParts release]; - NSDateComponents *weekdayComponents = [calendar components:NSWeekdayCalendarUnit fromDate:dateOnFirst]; - int weekdayOfFirst = [weekdayComponents weekday]; - - int numDaysInMonth = [calendar rangeOfUnit:NSDayCalendarUnit - inUnit:NSMonthCalendarUnit + NSDateComponents *weekdayComponents = [calendar components:NSCalendarUnitWeekday fromDate:dateOnFirst]; + int weekdayOfFirst = (int)[weekdayComponents weekday]; + + int numDaysInMonth = (int)[calendar rangeOfUnit:NSCalendarUnitDay + inUnit:NSCalendarUnitMonth forDate:dateOnFirst].length; didAddExtraRow = NO; diff --git a/OCCalendarView/OCDaysView~.m.bts b/OCCalendarView/OCDaysView~.m.bts new file mode 100644 index 0000000..e69de29 diff --git a/OCCalendarView/OCSelectionView.h b/OCCalendarView/OCSelectionView.h old mode 100644 new mode 100755 diff --git a/OCCalendarView/OCSelectionView.m b/OCCalendarView/OCSelectionView.m old mode 100644 new mode 100755 index 43915fc..2e360cb --- a/OCCalendarView/OCSelectionView.m +++ b/OCCalendarView/OCSelectionView.m @@ -66,8 +66,8 @@ - (void)drawRect:(CGRect)rect int tempEnd = MAX(startCellY, endCellY); for(int i = tempStart; i <= tempEnd; i++) { //// selectedRect Drawing - int thisRowEndCell; - int thisRowStartCell; + int thisRowEndCell = 0; + int thisRowStartCell = 0; if(startCellY == i) { thisRowStartCell = startCellX; if (startCellY > endCellY) { diff --git a/OCCalendarView/OCTypes.h b/OCCalendarView/OCTypes.h old mode 100644 new mode 100755