From 76076953f0b9541865b6c3a5bbf2a296fc25b5b6 Mon Sep 17 00:00:00 2001 From: Space Lord Date: Fri, 4 Nov 2016 12:00:20 +0100 Subject: [PATCH] Remove some CO-style comments. --- graf2d/cocoa/inc/QuartzWindow.h | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/graf2d/cocoa/inc/QuartzWindow.h b/graf2d/cocoa/inc/QuartzWindow.h index a0b119031ed67..c78d54df3448d 100644 --- a/graf2d/cocoa/inc/QuartzWindow.h +++ b/graf2d/cocoa/inc/QuartzWindow.h @@ -38,10 +38,8 @@ @interface QuartzWindow : NSWindow { @private - // 32-bit build requires explicit i-vars for synthesized props. QuartzWindow *fMainWindow; BOOL fHasFocus; - // QuartzView *fContentView; BOOL fDelayedTransient; @@ -49,10 +47,6 @@ BOOL fIsDeleted; } -//In Obj-C you do not have to declared everything in an interface declaration. -//I do declare all methods here, just for clarity. - -//Life-cycle: "ctor". - (id) initWithContentRect : (NSRect) contentRect styleMask : (NSUInteger) windowStyle backing : (NSBackingStoreType) bufferingType defer : (BOOL) deferCreation windowAttributes : (const SetWindowAttributes_t *) attr; @@ -164,8 +158,6 @@ @interface QuartzView : NSView { @protected - // 32-bit build requires explicit i-vars - // declared for synthesized props. unsigned fID; CGContextRef fContext; long fEventMask; @@ -188,10 +180,6 @@ ECursor fCurrentCursor; BOOL fIsDNDAware; - // TODO: std::unique_ptr (with deleter) can - // perfectly be an i-var, removing the manual - // memory management and raw pointer. - QuartzPixmap *fBackBuffer; NSMutableArray *fPassiveKeyGrabs; BOOL fIsOverlapped; @@ -240,7 +228,7 @@ @property (nonatomic, assign) int fBitGravity; @property (nonatomic, assign) int fWinGravity; @property (nonatomic, assign) unsigned long fBackgroundPixel; -@property (nonatomic, retain) QuartzImage *fBackgroundPixmap;//Hmm, image, pixmap ... +@property (nonatomic, retain) QuartzImage *fBackgroundPixmap; @property (nonatomic, readonly) int fMapState; @property (nonatomic, assign) BOOL fOverrideRedirect; @@ -255,8 +243,6 @@ @property (nonatomic, readonly) NSView *fContentView; @property (nonatomic, readonly) QuartzWindow *fQuartzWindow; -// - @property (nonatomic, assign) int fPassiveGrabButton; @property (nonatomic, assign) unsigned fPassiveGrabEventMask; @property (nonatomic, assign) unsigned fPassiveGrabKeyModifiers; @@ -270,8 +256,6 @@ - (BOOL) acceptsCrossingEvents : (unsigned) eventMask; -// - //Children subviews. - (void) addChild : (NSView *)child; @@ -279,16 +263,14 @@ - (void) getAttributes : (WindowAttributes_t *) attr; - (void) setAttributes : (const SetWindowAttributes_t *) attr; -// - (void) mapRaised; - (void) mapWindow; - (void) mapSubwindows; - (void) unmapWindow; -// + - (void) raiseWindow; - (void) lowerWindow; -// - (BOOL) fIsOverlapped; - (void) setOverlapped : (BOOL) overlap; @@ -324,8 +306,6 @@ @end - -//Aux. functions. namespace ROOT { namespace MacOSX { namespace X11 { @@ -361,7 +341,7 @@ NSPoint TranslateCoordinates(NSView *fromView, NSView *toV bool ViewIsTextViewFrame(NSView *view, bool checkParent); bool ViewIsHtmlViewFrame(NSView *view, bool checkParent); bool LockFocus(NSView *view); -void UnlockFocus(NSView *view);//For symmetry only. +void UnlockFocus(NSView *view); bool ScreenPointIsInView(NSView *view, Int_t x, Int_t y); QuartzWindow *FindWindowInPoint(Int_t x, Int_t y);