Replace #pragma mark with // MARK:

Replace objc directive with native Javascript version // MARK: to facilitate elimination of preproccsing pass.

AppKit/CPAlert.j

@@ -172,7 +172,7 @@ var bottomHeight = 71;
     BOOL                    _needsLayout;
 }
 
-#pragma mark Creating Alerts
+// MARK: Creating Alerts
 
 /*!
     Returns a CPAlert object with the provided info
@@ -249,8 +249,8 @@ var bottomHeight = 71;
 }
 
 
-#pragma mark -
-#pragma mark Delegate
+// MARK: -
+// MARK: Delegate
 
 /*!
     Set the delegate of the receiver
@@ -272,7 +272,7 @@ var bottomHeight = 71;
 }
 
 
-#pragma mark Accessors
+// MARK: Accessors
 
 - (CPTheme)theme
 {
@@ -402,7 +402,7 @@ var bottomHeight = 71;
     _needsLayout = YES;
 }
 
-#pragma mark Accessing Buttons
+// MARK: Accessing Buttons
 
 /*!
     Adds a button with a given title to the receiver.
@@ -438,7 +438,7 @@ var bottomHeight = 71;
     [_buttons insertObject:button atIndex:0];
 }
 
-#pragma mark Layout
+// MARK: Layout
 
 /*!
     @ignore
@@ -664,7 +664,7 @@ var bottomHeight = 71;
     _needsLayout = NO;
 }
 
-#pragma mark Displaying Alerts
+// MARK: Displaying Alerts
 
 /*!
     Displays the \c CPAlert panel as a modal dialog. The user will not be
@@ -742,7 +742,7 @@ var bottomHeight = 71;
     [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
 }
 
-#pragma mark Private
+// MARK: Private
 
 /*!
     @ignore

AppKit/CPAppearance.j

@@ -63,8 +63,8 @@ CPThemeStateAppearanceVibrantDark      = CPThemeState("appearance-vibrant-dark")
 }
 
 
-#pragma mark -
-#pragma mark Class Methods
+// MARK: -
+// MARK: Class Methods
 
 /*! Returns the current default CPAppearance
 */
@@ -99,8 +99,8 @@ CPThemeStateAppearanceVibrantDark      = CPThemeState("appearance-vibrant-dark")
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 /*! Creates a CPAppearance object initialized to the specified appearance file in the specified bundle
     This method does actually nothing special. It just creates a default appearance object
@@ -122,8 +122,8 @@ CPThemeStateAppearanceVibrantDark      = CPThemeState("appearance-vibrant-dark")
 }
 
 
-#pragma mark -
-#pragma mark Implementation
+// MARK: -
+// MARK: Implementation
 
 - (BOOL)isEqual:(id)anObject
 {
@@ -139,8 +139,8 @@ CPThemeStateAppearanceVibrantDark      = CPThemeState("appearance-vibrant-dark")
 }
 
 
-#pragma mark -
-#pragma mark CPCoding
+// MARK: -
+// MARK: CPCoding
 
 - (id)initWithCoder:(CPCoder)aCoder
 {
@@ -159,4 +159,4 @@ CPThemeStateAppearanceVibrantDark      = CPThemeState("appearance-vibrant-dark")
     [aCoder encodeBool:_allowsVibrancy forKey:@"_allowsVibrancy"];
 }
 
-@end
+@end

AppKit/CPBox.j

@@ -264,8 +264,8 @@ CPBelowBottom = 6;
     [self _manageTitlePositioning];
 }
 
-#pragma mark -
-#pragma mark Style properties which override theme values
+// MARK: -
+// MARK: Style properties which override theme values
 /*!
     The borderColor, borderWidth, cornerRadius and fillColor properties for the receiver
     are only supported for boxes with boxType === CPBoxCustom and borderType === CPLineBorder.
@@ -282,7 +282,7 @@ CPBelowBottom = 6;
 */
 
 // See discussion above.
-#pragma mark borderColor
+// MARK: borderColor
 - (CPColor)borderColor
 {
     return [self valueForThemeAttribute:@"border-color"];
@@ -308,7 +308,7 @@ CPBelowBottom = 6;
 }
 
 // See discussion above.
-#pragma mark borderWidth
+// MARK: borderWidth
 - (float)borderWidth
 {
     return [self valueForThemeAttribute:@"border-width"];
@@ -334,7 +334,7 @@ CPBelowBottom = 6;
 }
 
 // See discussion above.
-#pragma mark cornerRadius
+// MARK: cornerRadius
 - (float)cornerRadius
 {
     return [self valueForThemeAttribute:@"corner-radius"];
@@ -360,7 +360,7 @@ CPBelowBottom = 6;
 }
 
 // See discussion above.
-#pragma mark fillColor
+// MARK: fillColor
 - (CPColor)fillColor
 {
     return [self valueForThemeAttribute:@"background-color"];
@@ -761,7 +761,7 @@ CPBelowBottom = 6;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPBox (CSSTheming)
 
@@ -829,7 +829,7 @@ CPBelowBottom = 6;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 var CPBoxTypeKey          = @"CPBoxTypeKey",
     CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",

AppKit/CPButton.j

@@ -220,8 +220,8 @@ CPButtonImageOffset   = 3.0;
     [self setButtonType:CPMomentaryPushInButton];
 }
 
-#pragma mark -
-#pragma mark Control Size
+// MARK: -
+// MARK: Control Size
 
 - (void)setControlSize:(CPControlSize)aControlSize
 {
@@ -232,7 +232,7 @@ CPButtonImageOffset   = 3.0;
 }
 
 
-#pragma mark -
+// MARK: -
 
 // Setting the state
 /*!

AppKit/CPCheckBox.j

@@ -95,8 +95,8 @@ CPCheckBoxImageOffset = 4.0;
 }
 
 
-#pragma mark -
-#pragma mark Override methods from CPButton
+// MARK: -
+// MARK: Override methods from CPButton
 
 - (CGSize)_minimumFrameSize
 {
@@ -177,7 +177,7 @@ CPCheckBoxImageOffset = 4.0;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPCheckBox (TableDataView)
 

AppKit/CPCollectionView.j

@@ -202,8 +202,8 @@ var HORIZONTAL_MARGIN = 2;
 
 
 
-#pragma mark -
-#pragma mark Delegate
+// MARK: -
+// MARK: Delegate
 
 /*!
     Set the delegate of the receiver

AppKit/CPColor.j

@@ -89,8 +89,8 @@ var cachedBlackColor,
 }
 @global document
 
-#pragma mark -
-#pragma mark Theming
+// MARK: -
+// MARK: Theming
 
 + (CPString)defaultThemeClass
 {
@@ -109,8 +109,8 @@ var cachedBlackColor,
 }
 
 
-#pragma mark -
-#pragma mark Static methods
+// MARK: -
+// MARK: Static methods
 
 /*!
     Creates a color in the RGB colorspace, with an alpha value.
@@ -884,8 +884,8 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-#pragma mark -
-#pragma mark CSS Theming
+// MARK: -
+// MARK: CSS Theming
 
 // The code below adds support for CSS theming with 100% compatibility with current theming system.
 // The idea is to extend CPColor (and CPImage) with CSS components and adapt low level UI components to
@@ -1091,7 +1091,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-#pragma mark -
+// MARK: -
 
 /// @cond IGNORE
 var CPColorComponentsKey            = @"CPColorComponentsKey",

AppKit/CPColorWell.j

@@ -123,8 +123,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     return self;
 }
 
-#pragma mark -
-#pragma mark Draw
+// MARK: -
+// MARK: Draw
 
 /*!
     Sets whether the color well is bordered.
@@ -145,8 +145,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     return [self hasThemeState:CPThemeStateBordered];
 }
 
-#pragma mark -
-#pragma mark Managing Color
+// MARK: -
+// MARK: Managing Color
 
 /*!
     Returns the color well's current color.
@@ -199,8 +199,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     }
 }
 
-#pragma mark -
-#pragma mark Activating and Deactivating
+// MARK: -
+// MARK: Activating and Deactivating
 
 /*!
     Activates the color well, displays the color panel, and makes the panel's current color the same as its own.
@@ -241,8 +241,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     return YES;
 }
 
-#pragma mark -
-#pragma mark Event Handling
+// MARK: -
+// MARK: Event Handling
 
 - (void)mouseDown:(CPEvent)anEvent
 {
@@ -289,8 +289,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 }
 
 
-#pragma mark -
-#pragma mark Drag and Drop
+// MARK: -
+// MARK: Drag and Drop
 
 - (void)draggingEntered:(id)sender
 {
@@ -346,8 +346,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     return CPDragOperationCopy;
 }
 
-#pragma mark -
-#pragma mark Layout
+// MARK: -
+// MARK: Layout
 
 - (CGRect)contentRectForBounds:(CGRect)bounds
 {

AppKit/CPComboBox.j

@@ -133,7 +133,7 @@ var CPComboBoxTextSubview = @"text",
     [self setThemeState:CPComboBoxStateButtonBordered];
 }
 
-#pragma mark Setting Display Attributes
+// MARK: Setting Display Attributes
 
 - (BOOL)hasVerticalScroller
 {
@@ -214,7 +214,7 @@ var CPComboBoxTextSubview = @"text",
     _numberOfVisibleItems = MAX(visibleItems, 1);
 }
 
-#pragma mark Setting a Delegate
+// MARK: Setting a Delegate
 
 - (id <CPComboBoxDelegate>)delegate
 {
@@ -254,7 +254,7 @@ var CPComboBoxTextSubview = @"text",
     [super setDelegate:aDelegate];
 }
 
-#pragma mark Setting a Data Source
+// MARK: Setting a Data Source
 
 - (id <CPComboBoxDataSource>)dataSource
 {
@@ -305,7 +305,7 @@ var CPComboBoxTextSubview = @"text",
     [self reloadData];
 }
 
-#pragma mark Working with an Internal List
+// MARK: Working with an Internal List
 
 - (void)addItemsWithObjectValues:(CPArray)objects
 {
@@ -378,7 +378,7 @@ var CPComboBoxTextSubview = @"text",
         return _items.length;
 }
 
-#pragma mark Manipulating the Displayed List
+// MARK: Manipulating the Displayed List
 
 /*!
     Returns the delegate to be used when creating the pop up list.
@@ -594,7 +594,7 @@ var CPComboBoxTextSubview = @"text",
     [self sendAction:[self action] to:[self target]];
 }
 
-#pragma mark Manipulating the Selection
+// MARK: Manipulating the Selection
 
 - (void)deselectItemAtIndex:(int)index
 {
@@ -646,7 +646,7 @@ var CPComboBoxTextSubview = @"text",
         [self selectItemAtIndex:index];
 }
 
-#pragma mark Completing the Text Field
+// MARK: Completing the Text Field
 
 - (BOOL)completes
 {
@@ -693,7 +693,7 @@ var CPComboBoxTextSubview = @"text",
     _forceSelection = !!flag;
 }
 
-#pragma mark CPTextField Delegate Methods and Overrides
+// MARK: CPTextField Delegate Methods and Overrides
 
 /*! @ignore */
 - (BOOL)sendAction:(SEL)anAction to:(id)anObject
@@ -893,7 +893,7 @@ var CPComboBoxTextSubview = @"text",
         [_listDelegate setAlignment:alignment];
 }
 
-#pragma mark Pop Up Button Layout
+// MARK: Pop Up Button Layout
 
 - (CGRect)popupButtonRectForBounds:(CGRect)bounds
 {
@@ -938,7 +938,7 @@ var CPComboBoxTextSubview = @"text",
                             relativeToEphemeralSubviewNamed:@"content-view"];
 }
 
-#pragma mark Internal Helpers
+// MARK: Internal Helpers
 
 /*! @ignore */
 - (void)_dataSourceWarningForMethod:(SEL)cmd condition:(CPString)flag
@@ -1016,8 +1016,8 @@ var CPComboBoxTextSubview = @"text",
 }
 
 
-#pragma mark -
-#pragma mark Observers method
+// MARK: -
+// MARK: Observers method
 
 - (void)_addObservers
 {

AppKit/CPControl.j

@@ -207,8 +207,8 @@ var CPControlBlackColor = [CPColor blackColor];
     return self;
 }
 
-#pragma mark -
-#pragma mark Control Size
+// MARK: -
+// MARK: Control Size
 
 /*!
     Returns the control's control size
@@ -286,7 +286,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 
-#pragma mark -
+// MARK: -
 
 /*!
     Sets the receiver's target action.
@@ -1023,8 +1023,8 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 
-#pragma mark -
-#pragma mark Base writing direction
+// MARK: -
+// MARK: Base writing direction
 
 /*!
     Sets the initial writing direction of the receiver

AppKit/CPDatePicker/CPDatePicker.j

@@ -82,8 +82,8 @@ CPEraDatePickerElementFlag              = 0x0100;
 }
 
 
-#pragma mark -
-#pragma mark Theme methods
+// MARK: -
+// MARK: Theme methods
 
 + (CPString)defaultThemeClass
 {
@@ -174,8 +174,8 @@ CPEraDatePickerElementFlag              = 0x0100;
 }
 
 
-#pragma mark -
-#pragma mark Binding methods
+// MARK: -
+// MARK: Binding methods
 
 + (Class)_binderClassForBinding:(CPString)theBinding
 {
@@ -200,8 +200,8 @@ CPEraDatePickerElementFlag              = 0x0100;
 }
 
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 - (id)initWithFrame:(CGRect)aFrame
 {
@@ -271,8 +271,8 @@ CPEraDatePickerElementFlag              = 0x0100;
 }
 
 
-#pragma mark -
-#pragma mark Control Size
+// MARK: -
+// MARK: Control Size
 
 - (void)setControlSize:(CPControlSize)aControlSize
 {
@@ -285,8 +285,8 @@ CPEraDatePickerElementFlag              = 0x0100;
 }
 
 
-#pragma mark -
-#pragma mark Delegate methods
+// MARK: -
+// MARK: Delegate methods
 
 /*! Set the delegate of the datePicker
     @param aDelegate delegate of the datePicker
@@ -302,8 +302,8 @@ CPEraDatePickerElementFlag              = 0x0100;
 }
 
 
-#pragma mark -
-#pragma mark Layout method
+// MARK: -
+// MARK: Layout method
 
 /*! Layout the subviews
 */
@@ -313,8 +313,8 @@ CPEraDatePickerElementFlag              = 0x0100;
     [_datePickerComponent setNeedsDisplay:YES];
 }
 
-#pragma mark -
-#pragma mark Setter
+// MARK: -
+// MARK: Setter
 
 /*! Return the objectValue of the datePicker. The objectValue should take the timeZoneEffect
 */
@@ -651,8 +651,8 @@ CPEraDatePickerElementFlag              = 0x0100;
 }
 
 
-#pragma mark -
-#pragma mark First responder methods
+// MARK: -
+// MARK: First responder methods
 
 /*! Return YES if style is set to CPTextFieldAndStepperDatePickerStyle or CPTextFieldDatePickerStyle
 */
@@ -689,8 +689,8 @@ CPEraDatePickerElementFlag              = 0x0100;
 }
 
 
-#pragma mark -
-#pragma mark getter
+// MARK: -
+// MARK: getter
 
 /*!
     Returns \c YES if the textfield is bezeled.
@@ -723,8 +723,8 @@ CPEraDatePickerElementFlag              = 0x0100;
     return [[_locale objectForKey:CPLocaleCountryCode] isEqualToString:@"US"];
 }
 
-#pragma mark -
-#pragma mark Key event
+// MARK: -
+// MARK: Key event
 
 /*! Key down event
     @param anEvent

AppKit/CPDatePicker/_CPDatePickerCalendar.j

@@ -52,7 +52,7 @@
 }
 
 
-#pragma mark Init method
+// MARK: Init method
 
 /*! Init a _CPDatePickerCalendar
     @param aFrame
@@ -111,8 +111,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Responder methods
+// MARK: -
+// MARK: Responder methods
 
 - (BOOL)acceptsFirstResponder
 {
@@ -120,8 +120,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Getter Setter methods
+// MARK: -
+// MARK: Getter Setter methods
 
 /*! Set the date value of the component. It sets the dateValue of the header and the monthView also
     @param aDateValue
@@ -160,8 +160,8 @@
     [self _init];
 }
 
-#pragma mark -
-#pragma mark Layout methods
+// MARK: -
+// MARK: Layout methods
 
 /*! Manager the subviews. It hides or not the clock.
 */
@@ -221,8 +221,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Action methods
+// MARK: -
+// MARK: Action methods
 
 /*! Move to the nextMonth without changing the dateValue of the datePicker
 */

AppKit/CPDatePicker/_CPDatePickerClock.j

@@ -71,8 +71,8 @@ _CPDatePickerClockSeconds = 3;
 }
 
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 - (id)initWithFrame:(CGRect)aFrame datePicker:(CPDatePicker)aDatePicker
 {
@@ -200,7 +200,7 @@ _CPDatePickerClockSeconds = 3;
 #endif
 }
 
-#pragma mark Layout methods
+// MARK: Layout methods
 
 - (void)layoutSubviews
 {
@@ -246,7 +246,7 @@ _CPDatePickerClockSeconds = 3;
 //    [_middleHandLayer setNeedsDisplay];
 }
 
-#pragma mark Accessors
+// MARK: Accessors
 
 - (void)setEnabled:(BOOL)shouldEnable
 {
@@ -261,7 +261,7 @@ _CPDatePickerClockSeconds = 3;
     [self setNeedsLayout];
 }
 
-#pragma mark Mouse actions
+// MARK: Mouse actions
 
 - (void)mouseDown:(CPEvent)anEvent
 {
@@ -425,7 +425,7 @@ _CPDatePickerClockSeconds = 3;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation HandLayer : CALayer
 {
@@ -434,7 +434,7 @@ _CPDatePickerClockSeconds = 3;
     float           _rotationRadians;
 }
 
-#pragma mark Init methods
+// MARK: Init methods
 
 - (id)initWithSize:(CGSize)aSize
 {
@@ -453,7 +453,7 @@ _CPDatePickerClockSeconds = 3;
 }
 
 
-#pragma mark Setter Getter methods
+// MARK: Setter Getter methods
 
 /*!
     Set the bounds of the layer. The imageLayer will be at the center of this bounds.
@@ -516,7 +516,7 @@ _CPDatePickerClockSeconds = 3;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation HandImageLayer : CALayer
 {
@@ -550,7 +550,7 @@ _CPDatePickerClockSeconds = 3;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation HoursLayer : CALayer
 {

AppKit/CPDatePicker/_CPDatePickerDayView.j

@@ -41,7 +41,7 @@
 }
 
 
-#pragma mark Init methods
+// MARK: Init methods
 
 /*! Create a new instance of _CPDatePickerDayView
     @param aFrame
@@ -123,8 +123,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Theme methods
+// MARK: -
+// MARK: Theme methods
 
 /*! Set a theme
 */
@@ -143,8 +143,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Getter methods
+// MARK: -
+// MARK: Getter methods
 
 /*! Select the tile
 */
@@ -205,8 +205,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Layout methods
+// MARK: -
+// MARK: Layout methods
 
 /*! Layout the subviews
 */

AppKit/CPDatePicker/_CPDatePickerElementTextField.j

@@ -481,8 +481,8 @@ CPAMPMDateType = 6;
 }
 
 
-#pragma mark -
-#pragma mark Mouse event
+// MARK: -
+// MARK: Mouse event
 
 /*! Mouse down event. Launch a notification to notif the new first responder textField
 */
@@ -496,8 +496,8 @@ CPAMPMDateType = 6;
 }
 
 
-#pragma mark -
-#pragma mark Theme functions
+// MARK: -
+// MARK: Theme functions
 
 /*! Set the theme CPThemeStateSelected
 */
@@ -517,8 +517,8 @@ CPAMPMDateType = 6;
 }
 
 
-#pragma mark -
-#pragma mark Override
+// MARK: -
+// MARK: Override
 
 /*!
     We override this method to get all the time the good width
@@ -584,7 +584,7 @@ CPAMPMDateType = 6;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPDatePickerElementSeparator : CPTextField
 

AppKit/CPDatePicker/_CPDatePickerElementView.j

@@ -50,7 +50,7 @@
 }
 
 
-#pragma mark Init
+// MARK: Init
 
 - (id)initWithFrame:(CGRect)aFrame withDatePicker:(CPDatePicker)aDatePicker
 {
@@ -141,8 +141,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Responder methods
+// MARK: -
+// MARK: Responder methods
 
 /*! @ignore */
 - (BOOL)acceptsFirstResponder
@@ -154,8 +154,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Override observers
+// MARK: -
+// MARK: Override observers
 
 - (void)_removeObservers
 {
@@ -177,8 +177,8 @@
     [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_datePickerElementTextFieldAMPMChangedNotification:) name:CPDatePickerElementTextFieldAMPMChangedNotification object:_textFieldPMAM];
 }
 
-#pragma mark -
-#pragma mark Mouse event
+// MARK: -
+// MARK: Mouse event
 
 - (BOOL)continueTracking:(CGPoint)lastPoint at:(CGPoint)aPoint
 {
@@ -229,8 +229,8 @@
     return nil;
 }
 
-#pragma mark -
-#pragma mark Setter Getter methods
+// MARK: -
+// MARK: Setter Getter methods
 
 /*! Set the value of the textFields
     @param aDateValue the value
@@ -378,8 +378,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Notification methods
+// MARK: -
+// MARK: Notification methods
 
 /*! Called when changing AM or PM
     @param aNotification
@@ -413,8 +413,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Layout methods
+// MARK: -
+// MARK: Layout methods
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
@@ -886,8 +886,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Responder methods
+// MARK: -
+// MARK: Responder methods
 
 - (void)_updateResponderTextField
 {

AppKit/CPDatePicker/_CPDatePickerHeaderView.j

@@ -50,7 +50,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 }
 
 
-#pragma mark Init methods
+// MARK: Init methods
 
 /*! Init a new instance of _CPDatePickerHeaderView
     @param aFrame
@@ -153,8 +153,8 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 }
 
 
-#pragma mark -
-#pragma mark Getter Setter methods
+// MARK: -
+// MARK: Getter Setter methods
 
 /*! Return the day names depending on the CPLocale of the datePicker
     @return an array
@@ -242,8 +242,8 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 }
 
 
-#pragma mark -
-#pragma mark Layout methods
+// MARK: -
+// MARK: Layout methods
 
 /*! Layout the subviews
 */

AppKit/CPDatePicker/_CPDatePickerMonthView.j

@@ -46,7 +46,7 @@
 }
 
 
-#pragma mark Init methods
+// MARK: Init methods
 
 /*! Init a _CPDatePickerMonthView
     @param aFrame
@@ -77,8 +77,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Getter Setter methods
+// MARK: -
+// MARK: Getter Setter methods
 
 /*! Set the monthDate of the component
     @param aDate
@@ -194,8 +194,8 @@
     return tileIndex;
 }
 
-#pragma mark -
-#pragma mark Reload data
+// MARK: -
+// MARK: Reload data
 
 /*! Reload the data
 */
@@ -235,8 +235,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Select methods
+// MARK: -
+// MARK: Select methods
 
 /*! Select one date or several date depending of the giving interval
     @param aStartDate
@@ -297,8 +297,8 @@
     }
 }
 
-#pragma mark -
-#pragma mark Layout methods
+// MARK: -
+// MARK: Layout methods
 
 /*! Tile the view
 */
@@ -438,8 +438,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Mouse event
+// MARK: -
+// MARK: Mouse event
 
 /*! Mouse down event
 */
@@ -596,8 +596,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Timer
+// MARK: -
+// MARK: Timer
 
 - (void)_timerNextMonthEvent:(CPEvent)anEvent
 {
@@ -618,8 +618,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Date methods
+// MARK: -
+// MARK: Date methods
 
 - (CPDate)_hoursMinutesSecondsFromDatePickerForDate:(CPDate)aDate
 {

AppKit/CPDatePicker/_CPDatePickerTextField.j

@@ -62,7 +62,7 @@
 }
 
 
-#pragma mark Init
+// MARK: Init
 
 - (id)initWithFrame:(CGRect)aFrame withDatePicker:(CPDatePicker)aDatePicker
 {
@@ -103,8 +103,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Override responder methods
+// MARK: -
+// MARK: Override responder methods
 
 - (BOOL)becomeFirstResponder
 {
@@ -138,8 +138,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Setter Getter methods
+// MARK: -
+// MARK: Setter Getter methods
 
 /*! Set the value of the control
     @param aDateValue
@@ -188,8 +188,8 @@
     [self setNeedsLayout];
 }
 
-#pragma mark -
-#pragma mark Notification methods
+// MARK: -
+// MARK: Notification methods
 
 /*! This is called to when the user just changed the selected textField
     @param aNotification
@@ -207,8 +207,8 @@
 }
 
 
-#pragma mark -
-#pragma mark SelectTextField action
+// MARK: -
+// MARK: SelectTextField action
 
 - (void)_selectTextFieldWithFlags:(unsigned)flags
 {
@@ -273,8 +273,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Events
+// MARK: -
+// MARK: Events
 
 /*! Called when the user click on the stepper
 */
@@ -557,8 +557,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Layout methods
+// MARK: -
+// MARK: Layout methods
 
 /*! Layout the subviews
 */
@@ -607,8 +607,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Override observers
+// MARK: -
+// MARK: Override observers
 
 - (void)_removeObservers
 {

AppKit/CPImage.j

@@ -517,8 +517,8 @@ function CPAppKitImage(aFilename, aSize)
 
 @end
 
-#pragma mark -
-#pragma mark CSS Theming
+// MARK: -
+// MARK: CSS Theming
 
 // The code below adds support for CSS theming with 100% compatibility with current theming system.
 // The idea is to extend CPImage (and CPColor) with CSS components and adapt low level UI components to
@@ -738,7 +738,7 @@ var CPImageCSSDictionaryKey       = @"CPImageCSSDictionaryKey",
     CPImageCSSBeforeDictionaryKey = @"CPImageCSSBeforeDictionaryKey",
     CPImageCSSAfterDictionaryKey  = @"CPImageCSSAfterDictionaryKey";
 
-#pragma mark -
+// MARK: -
 
 @implementation CPImage (CPCoding)
 
@@ -775,8 +775,8 @@ var CPImageCSSDictionaryKey       = @"CPImageCSSDictionaryKey",
 
 @end
 
-#pragma mark -
-#pragma mark Drawing
+// MARK: -
+// MARK: Drawing
 
 @implementation CPImage (Drawing)
 
@@ -813,7 +813,7 @@ var CPImageCSSDictionaryKey       = @"CPImageCSSDictionaryKey",
 @end
 
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPMaterialIconImage : CPImage
 {
@@ -973,7 +973,7 @@ var CPImageCSSDictionaryKey       = @"CPImageCSSDictionaryKey",
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPThreePartImage : CPObject
 {
@@ -1116,7 +1116,7 @@ var CPNinePartImageImageSlicesKey   = @"CPNinePartImageImageSlicesKey";
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPImage (Duplication)
 

AppKit/CPMenu/CPMenu.j

@@ -1356,7 +1356,7 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPMenu (CSSTheming)
 

AppKit/CPMenu/_CPMenuWindow.j

@@ -433,7 +433,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPMenuWindow (CSSTheming)
 
@@ -446,7 +446,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 /*
     @ignore
@@ -617,7 +617,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPMenuView (CSSTheming)
 

AppKit/CPMenuItem/CPMenuItem.j

@@ -826,7 +826,7 @@ CPControlKeyMask
     return [[self menu] highlightedItem] == self;
 }
 
-#pragma mark CPObject Overrides
+// MARK: CPObject Overrides
 
 /*!
     Returns a copy of the item. The copy does not belong If the item has a submenu, it is NOT copied.
@@ -867,7 +867,7 @@ CPControlKeyMask
     return [self copy];
 }
 
-#pragma mark Internal
+// MARK: Internal
 
 /*
     @ignore
@@ -897,7 +897,7 @@ CPControlKeyMask
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPMenuItem (CSSTheming)
 
@@ -909,7 +909,7 @@ CPControlKeyMask
 
 @end
 
-#pragma mark -
+// MARK: -
 
 var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
 

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -406,11 +406,11 @@
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPMenuItemStandardView (CSSTheming)
 
-#pragma mark Override
+// MARK: Override
 
 - (void)_setThemeIncludingDescendants:(CPTheme)aTheme
 {
@@ -420,7 +420,7 @@
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPMenuItemSubmenuIndicatorView : CPView
 {

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -252,11 +252,11 @@
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPMenuItemView (CSSTheming)
 
-#pragma mark Override
+// MARK: Override
 
 - (void)_setThemeIncludingDescendants:(CPTheme)aTheme
 {
@@ -275,7 +275,7 @@
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPMenuItemArrowView : CPView
 {

AppKit/CPPanel.j

@@ -121,8 +121,8 @@ CPDocModalWindowMask    = 1 << 6;
 }
 
 
-#pragma mark -
-#pragma mark Overrides
+// MARK: -
+// MARK: Overrides
 
 /*!
     @ignore

AppKit/CPPopover.j

@@ -84,8 +84,8 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 /*!
     Initialize the CPPopover witn default values
@@ -105,8 +105,8 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 }
 
 
-#pragma mark -
-#pragma mark Getters / Setters
+// MARK: -
+// MARK: Getters / Setters
 
 /*!
     Returns the current rect of the popover
@@ -220,8 +220,8 @@ Set the behavior of the CPPopover. It can be:
         _implementedDelegateMethods |= CPPopoverDelegate_popover_didClose_;
 }
 
-#pragma mark -
-#pragma mark Positioning
+// MARK: -
+// MARK: Positioning
 
 /*!
     Show the popover
@@ -298,8 +298,8 @@ Set the behavior of the CPPopover. It can be:
 }
 
 
-#pragma mark -
-#pragma mark Action
+// MARK: -
+// MARK: Action
 
 /*!
     Close the popover
@@ -318,8 +318,8 @@ Set the behavior of the CPPopover. It can be:
 }
 
 
-#pragma mark -
-#pragma mark Delegates
+// MARK: -
+// MARK: Delegates
 
 /*! @ignore */
 - (BOOL)_popoverWindowShouldClose

AppKit/CPRadio.j

@@ -187,7 +187,7 @@ CPRadioImageOffset = 4.0;
     [self _setRadioGroup];
 }
 
-#pragma mark Private methods
+// MARK: Private methods
 
 - (void)_setRadioGroup
 {
@@ -260,8 +260,8 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
     [aCoder encodeObject:_radioGroup forKey:CPRadioRadioGroupKey];
 }
 
-#pragma mark -
-#pragma mark Override methods from CPButton
+// MARK: -
+// MARK: Override methods from CPButton
 
 - (CPThemeState)_contentVisualState
 {
@@ -412,7 +412,7 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
     [_radios makeObjectsPerformSelector:@selector(setHidden:) withObject:hidden];
 }
 
-#pragma mark Private
+// MARK: Private
 
 - (void)_addRadio:(CPRadio)aRadio
 {

AppKit/CPRuleEditor/CPPredicateEditor.j

@@ -34,7 +34,7 @@
     SEL     _predicateAction @accessors(property=action);
 }
 
-#pragma mark public methods
+// MARK: public methods
 /*!
     @ingroup appkit
     @class CPPredicateEditor
@@ -251,7 +251,7 @@
     return tree;
 }
 
-#pragma mark Set the Predicate
+// MARK: Set the Predicate
 
 - (void)setObjectValue:(id)objectValue
 {
@@ -374,7 +374,7 @@
     return row;
 }
 
-#pragma mark Get the predicate
+// MARK: Get the predicate
 
 - (void)_updatePredicate
 {
@@ -452,7 +452,7 @@
     return CPAndPredicateType;
 }
 
-#pragma mark Control delegate
+// MARK: Control delegate
 
 - (void)_sendRuleAction
 {
@@ -487,7 +487,7 @@
 }
 */
 
-#pragma mark RuleEditor delegate methods
+// MARK: RuleEditor delegate methods
 
 - (int)_queryNumberOfChildrenOfItem:(id)rowItem withRowType:(CPRuleEditorRowType)type
 {

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -1304,7 +1304,7 @@ TODO: implement
     return shouldHide;
 }
 
-#pragma mark Rows management
+// MARK: Rows management
 
 - (id)_rowCacheForIndex:(int)index
 {
@@ -1566,7 +1566,7 @@ TODO: implement
     return row;
 }
 
-#pragma mark Key value observing
+// MARK: Key value observing
 
 - (void)_startObservingRowObjectsRecursively:(CPArray)rowObjects
 {

AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j

@@ -97,7 +97,7 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
     return aString;
 }
 
-#pragma mark - Formatting & Reordering Helpers
+// MARK: - Formatting & Reordering Helpers
 
 - (CPString)_englishRepresentationForView:(id)aView
 {

AppKit/CPScrollView.j

@@ -153,8 +153,8 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
 }
 
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 + (void)initialize
 {
@@ -285,8 +285,8 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 - (id)initWithFrame:(CGRect)aFrame
 {
@@ -329,8 +329,8 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
 }
 
 
-#pragma mark -
-#pragma mark Getters / Setters
+// MARK: -
+// MARK: Getters / Setters
 
 /*!
     The delegate of the scroll view
@@ -808,8 +808,8 @@ Notifies the delegate when the scroll view has finished scrolling.
 }
 
 
-#pragma mark -
-#pragma mark Rulers
+// MARK: -
+// MARK: Rulers
 
 - (BOOL)hasHorizontalRuler
 {
@@ -905,8 +905,8 @@ Notifies the delegate when the scroll view has finished scrolling.
 }
 
 
-#pragma mark -
-#pragma mark Privates
+// MARK: -
+// MARK: Privates
 
 /* @ignore */
 - (void)_updateScrollerStyle
@@ -1226,8 +1226,8 @@ Notifies the delegate when the scroll view has finished scrolling.
 
 
 
-#pragma mark -
-#pragma mark Utilities
+// MARK: -
+// MARK: Utilities
 
 /*!
     Lays out the scroll view's components.
@@ -1491,8 +1491,8 @@ Notifies the delegate when the scroll view has finished scrolling.
     return [_contentView documentVisibleRect];
 }
 
-#pragma mark -
-#pragma mark Overrides
+// MARK: -
+// MARK: Overrides
 
 
 - (void)_removeObservers
@@ -1732,7 +1732,7 @@ Notifies the delegate when the scroll view has finished scrolling.
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPScrollView (FirstResponder)
 
@@ -1776,7 +1776,7 @@ Notifies the delegate when the scroll view has finished scrolling.
 
 @end
 
-#pragma mark -
+// MARK: -
 
 var CPScrollViewContentViewKey          = @"CPScrollViewContentView",
     CPScrollViewHeaderClipViewKey       = @"CPScrollViewHeaderClipViewKey",

AppKit/CPScroller.j

@@ -102,8 +102,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 }
 
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 + (CPString)defaultThemeClass
 {
@@ -167,8 +167,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 - (id)initWithFrame:(CGRect)aFrame
 {
@@ -203,8 +203,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 }
 
 
-#pragma mark -
-#pragma mark Getters / Setters
+// MARK: -
+// MARK: Getters / Setters
 
 /*!
     Returns the scroller's style
@@ -269,8 +269,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 }
 
 
-#pragma mark -
-#pragma mark Privates
+// MARK: -
+// MARK: Privates
 
 /*! @ignore */
 - (void)_adjustScrollerSize
@@ -295,8 +295,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 }
 
 
-#pragma mark -
-#pragma mark Utilities
+// MARK: -
+// MARK: Utilities
 
 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
@@ -468,8 +468,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 }
 
 
-#pragma mark -
-#pragma mark  Drawing
+// MARK: -
+// MARK:  Drawing
 
 /*!
     Draws the specified arrow and sets the highlight.
@@ -703,8 +703,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 }
 
 
-#pragma mark -
-#pragma mark Overrides
+// MARK: -
+// MARK: Overrides
 
 - (id)currentValueForThemeAttribute:(CPString)anAttributeName
 {
@@ -780,8 +780,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return [self currentValueForThemeAttribute:@"scroller-width"];
 }
 
-#pragma mark -
-#pragma mark Delegates
+// MARK: -
+// MARK: Delegates
 
 - (void)animationDidEnd:(CPAnimation)animation
 {

AppKit/CPSearchField.j

@@ -136,8 +136,8 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 }
 
 
-#pragma mark -
-#pragma mark Override observers
+// MARK: -
+// MARK: Override observers
 
 - (void)_removeObservers
 {
@@ -788,7 +788,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPSearchField (ThemingAdditions)
 
@@ -980,7 +980,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPSearchField (CPTrackingArea)
 {
@@ -1035,7 +1035,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat
 
 @end
 
-#pragma mark -
+// MARK: -
 
 var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
     CPSendsWholeSearchStringKey         = @"CPSendsWholeSearchStringKey",

AppKit/CPSlider.j

@@ -586,7 +586,7 @@ var AFFINITY = 5;
             return [self setFloatValue:1.0];
 }
 
-#pragma mark - New methods as in High Sierra (10.13)
+// MARK: - New methods as in High Sierra (10.13)
 
 /*!
     Creates and returns a continuous horizontal slider whose values range from 0.0 to 1.0.
@@ -812,7 +812,7 @@ var AFFINITY = 5;
     return [self valueForThemeAttribute:@"left-track-color" inStates:normalState];
 }
 
-#pragma mark - Private methods
+// MARK: - Private methods
 
 - (void)_refreshCachesAndStates
 {
@@ -1050,7 +1050,7 @@ var AFFINITY = 5;
     return value;
 }
 
-#pragma mark - Overrides
+// MARK: - Overrides
 
 - (void)setFrameSize:(CGSize)aSize
 {
@@ -1060,7 +1060,7 @@ var AFFINITY = 5;
     [self setNeedsDisplay:YES];
 }
 
-#pragma mark -
+// MARK: -
 
 @end
 

AppKit/CPSound.j

@@ -66,8 +66,8 @@ CPSoundPlayBackStatePause   = 2;
     unsigned            _implementedDelegateMethods;
 }
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 - (id)init
 {
@@ -147,8 +147,8 @@ CPSoundPlayBackStatePause   = 2;
 }
 
 
-#pragma mark -
-#pragma mark Delegate methods
+// MARK: -
+// MARK: Delegate methods
 
 /*!
     Sets the sound's delegate.
@@ -166,8 +166,8 @@ CPSoundPlayBackStatePause   = 2;
         _implementedDelegateMethods |= CPSoundDelegate_sound_didFinishPlaying_;
 }
 
-#pragma mark -
-#pragma mark Events listener
+// MARK: -
+// MARK: Events listener
 
 /*! @ignore
 */
@@ -199,8 +199,8 @@ CPSoundPlayBackStatePause   = 2;
 }
 
 
-#pragma mark -
-#pragma mark Media controls
+// MARK: -
+// MARK: Media controls
 
 /*!
     Play the sound.
@@ -324,8 +324,8 @@ CPSoundPlayBackStatePause   = 2;
     _audioTag.volume = aVolume;
 }
 
-#pragma mark -
-#pragma mark Accessors
+// MARK: -
+// MARK: Accessors
 
 /*!
     Returns the duration in seconds of the sound.
@@ -364,4 +364,4 @@ CPSoundPlayBackStatePause   = 2;
     [_delegate sound:self didFinishPlaying:finishedPlaying];
 }
 
-@end
+@end

AppKit/CPSplitView.j

@@ -216,7 +216,7 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
     [self _setVertical:YES];
 }
 
-#pragma mark - Properties
+// MARK: - Properties
 
 - (CPSplitViewDividerStyle)dividerStyle
 {
@@ -479,7 +479,7 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
     return _delegate;
 }
 
-#pragma mark - Subviews management
+// MARK: - Subviews management
 
 // FIXME: il faut également tenir compte des button bars quand on ajouter / insert une vue.
 // Par exemple, si une button bar est placée sur la dernière vue, pas de resize à droite mais
@@ -652,7 +652,7 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
     _subviewsManagementDisabled = NO;
 }
 
-#pragma mark - Layout subviews
+// MARK: - Layout subviews
 
 - (CGRect)rectOfDividerAtIndex:(int)aDivider
 {
@@ -845,7 +845,7 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
     [self updateTrackingAreas];
 }
 
-#pragma mark - Private layout utilities
+// MARK: - Private layout utilities
 
 - (void)_distribute:(CPInteger)remainingSpace amoung:(CPInteger)count onFlexible:(BOOL)onFlexible fromIndex:(CPInteger)fromIndex toIndex:(CPInteger)toIndex
 {
@@ -900,7 +900,7 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
             [_ratios addObject:(_initialSizes[i] / fixedSpace)];
 }
 
-#pragma mark -
+// MARK: -
 
 /*!
     Returns YES if the supplied subview is collapsed, otherwise NO.
@@ -1487,7 +1487,7 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPSplitView (CPTrackingArea)
 {
@@ -1567,7 +1567,7 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPSplitView (CPSplitViewDelegate)
 
@@ -1745,7 +1745,7 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
 
 @end
 
-#pragma mark -
+// MARK: -
 
 var CPSplitViewDelegateKey            = @"CPSplitViewDelegateKey",
     CPSplitViewIsVerticalKey          = @"CPSplitViewIsVerticalKey",
@@ -1870,7 +1870,7 @@ var CPSplitViewDelegateKey            = @"CPSplitViewDelegateKey",
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPSplitView (Deprecated)
 

AppKit/CPStackView.j

@@ -82,8 +82,8 @@ var CPStackViewSpacingUseDefault = 3.40282347e+38; // FLT_MAX
     CPMapTable                          _visibilityPriorities;
 }
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 + (CPStackView)stackViewWithViews:(CPArray)views
 {
@@ -116,8 +116,8 @@ var CPStackViewSpacingUseDefault = 3.40282347e+38; // FLT_MAX
     return self;
 }
 
-#pragma mark -
-#pragma mark Configuration
+// MARK: -
+// MARK: Configuration
 
 /*!
     The horizontal or vertical layout direction of the stack view.
@@ -222,8 +222,8 @@ var CPStackViewSpacingUseDefault = 3.40282347e+38; // FLT_MAX
     [self setNeedsLayout:YES];
 }
 
-#pragma mark -
-#pragma mark Managing Views in Gravity Areas
+// MARK: -
+// MARK: Managing Views in Gravity Areas
 
 - (CPArray)_containerForGravity:(CPStackViewGravity)gravity
 {
@@ -358,8 +358,8 @@ var CPStackViewSpacingUseDefault = 3.40282347e+38; // FLT_MAX
     [self removeView:view];
 }
 
-#pragma mark -
-#pragma mark Custom Spacing
+// MARK: -
+// MARK: Custom Spacing
 
 - (float)customSpacingAfterView:(CPView)aView
 {
@@ -388,8 +388,8 @@ var CPStackViewSpacingUseDefault = 3.40282347e+38; // FLT_MAX
     return _spacing;
 }
 
-#pragma mark -
-#pragma mark Visibility Priority
+// MARK: -
+// MARK: Visibility Priority
 
 - (void)setVisibilityPriority:(float)priority forView:(CPView)aView
 {
@@ -418,8 +418,8 @@ var CPStackViewSpacingUseDefault = 3.40282347e+38; // FLT_MAX
     return CPStackViewVisibilityPriorityMustHold;
 }
 
-#pragma mark -
-#pragma mark Layout
+// MARK: -
+// MARK: Layout
 
 - (void)resizeSubviewsWithOldSize:(CGSize)oldSize
 {
@@ -649,8 +649,8 @@ var CPStackViewSpacingUseDefault = 3.40282347e+38; // FLT_MAX
     return cursor;
 }
 
-#pragma mark -
-#pragma mark CPCoding
+// MARK: -
+// MARK: CPCoding
 
 - (id)initWithCoder:(CPCoder)aCoder
 {

AppKit/CPStepper.j

@@ -42,8 +42,8 @@
     CPButton    _buttonUp;
 }
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 /*!
     Initializes a CPStepper with given values.
@@ -147,8 +147,8 @@
     [self _sizeToFit];
 }
 
-#pragma mark -
-#pragma mark Superclass overrides
+// MARK: -
+// MARK: Superclass overrides
 
 /*!
     Set if the CPStepper is enabled or not.
@@ -230,8 +230,8 @@
         [super setDoubleValue:aValue];
 }
 
-#pragma mark -
-#pragma mark Actions
+// MARK: -
+// MARK: Actions
 
 /*! @ignore */
 - (IBAction)_buttonDidClick:(id)aSender
@@ -266,8 +266,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Theming
+// MARK: -
+// MARK: Theming
 
 + (CPString)defaultThemeClass
 {

AppKit/CPTabView.j

@@ -696,8 +696,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     [self _displayItemView:_placeholderView];
 }
 
-#pragma mark -
-#pragma mark Override
+// MARK: -
+// MARK: Override
 
 /*!
     Enabled controls accept first mouse by default.
@@ -886,11 +886,11 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPTabView (CSSTheming)
 
-#pragma mark Override
+// MARK: Override
 
 - (void)_setThemeIncludingDescendants:(CPTheme)aTheme
 {
@@ -906,7 +906,7 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation _CPTabViewBox : CPBox
 {
@@ -915,8 +915,8 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 }
 
 
-#pragma mark -
-#pragma mark Override
+// MARK: -
+// MARK: Override
 
 - (id)initWithFrame:(CGRect)aFrame
 {

AppKit/CPTableView.j

@@ -5761,8 +5761,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 }
 
 
-#pragma mark -
-#pragma mark DataSource methods to implement
+// MARK: -
+// MARK: DataSource methods to implement
 
 /*!
     @ignore
@@ -6030,8 +6030,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 }
 
 
-#pragma mark -
-#pragma mark Delegate methods to implement
+// MARK: -
+// MARK: Delegate methods to implement
 
 /*!
     @ignore

AppKit/CPTextField.j

@@ -245,8 +245,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 
-#pragma mark -
-#pragma mark Control Size
+// MARK: -
+// MARK: Control Size
 
 - (void)setControlSize:(CPControlSize)aControlSize
 {
@@ -257,7 +257,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 
-#pragma mark -
+// MARK: -
 
 #if PLATFORM(DOM)
 - (DOMElement)_inputElement
@@ -381,7 +381,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return self;
 }
 
-#pragma mark Controlling Editability and Selectability
+// MARK: Controlling Editability and Selectability
 
 /*!
     Sets whether or not the receiver text field can be edited. If NO, any
@@ -1844,7 +1844,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [self _didEdit];
 }
 
-#pragma mark Setting the Delegate
+// MARK: Setting the Delegate
 
 - (void)setDelegate:(id <CPTextFieldDelegate>)aDelegate
 {
@@ -2004,7 +2004,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self _setCSSStyleForInputElement];
 }
 
-#pragma mark Overrides
+// MARK: Overrides
 
 /*!
     Sets the font of the receiver.
@@ -2057,7 +2057,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         }
 }
 
-#pragma mark Overrides
+// MARK: Overrides
 
 /*!
     Sets the text color of the receiver.
@@ -2126,7 +2126,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return YES;
 }
 
-#pragma mark Private
+// MARK: Private
 
 - (BOOL)_isWithinUsablePlatformRect
 {
@@ -2425,7 +2425,7 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPTextField (TableDataView)
 
@@ -2442,7 +2442,7 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPTextField (Deprecated)
 

AppKit/CPTextView/CPFontPanel.j

@@ -86,8 +86,8 @@ var _availableTraits = [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
     int     _fontChanges;
 }
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 /*!
     Check if the shared Font panel exists.
@@ -113,8 +113,8 @@ var _availableTraits = [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
     return NO;
 }
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 /*! @ignore */
 - (id)init

AppKit/CPTextView/CPLayoutManager.j

@@ -76,8 +76,8 @@ _oncontextmenuhandler = function () { return false; };
 }
 
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 - (id)init
 {
@@ -103,8 +103,8 @@ _oncontextmenuhandler = function () { return false; };
 }
 
 
-#pragma mark -
-#pragma mark Text containes method
+// MARK: -
+// MARK: Text containes method
 
 - (void)insertTextContainer:(CPTextContainer)aContainer atIndex:(int)index
 {
@@ -1132,8 +1132,8 @@ var _objectsInRange = function(aList, aRange)
     CPMutableArray  _runs;
 }
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 - (id)createDOMElementWithText:(CPString)aString andFont:(CPFont)aFont andColor:(CPColor)aColor
 {

AppKit/CPTextView/CPRulerView.j

@@ -154,8 +154,8 @@ CPRulerOrientationVertical = 1
         }
     }
 }
-#pragma mark -
-#pragma mark Context Menu Support
+// MARK: -
+// MARK: Context Menu Support
 
 - (CPMenu)menuForEvent:(CPEvent)anEvent
 {
@@ -385,8 +385,8 @@ CPRulerOrientationVertical = 1
 }
 
 
-#pragma mark -
-#pragma mark Interaction Handlers
+// MARK: -
+// MARK: Interaction Handlers
 
 - (void)mouseDown:(CPEvent)anEvent
 {
@@ -500,8 +500,8 @@ CPRulerOrientationVertical = 1
 }
 
 
-#pragma mark -
-#pragma mark DOM Layout Builder
+// MARK: -
+// MARK: DOM Layout Builder
 
 - (void)updateRuler
 {

AppKit/CPTextView/CPTextContainer.j

@@ -89,8 +89,8 @@ CPLineMovesUp = 4;
 }
 
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 - (id)initWithContainerSize:(CGSize)aSize
 {
@@ -118,8 +118,8 @@ CPLineMovesUp = 4;
     [_layoutManager addTextContainer:self];
 }
 
-#pragma mark -
-#pragma mark Setter methods
+// MARK: -
+// MARK: Setter methods
 
 - (void)setContainerSize:(CGSize)someSize
 {

AppKit/CPTextView/CPTextStorage.j

@@ -70,8 +70,8 @@ var CPTextStorageDelegate_textStorageWillProcessEditing_ = 1 << 1,
 }
 
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 - (id)initWithString:(CPString)aString attributes:(CPDictionary)attributes
 {
@@ -99,8 +99,8 @@ var CPTextStorageDelegate_textStorageWillProcessEditing_ = 1 << 1,
 }
 
 
-#pragma mark -
-#pragma mark Delegate methods
+// MARK: -
+// MARK: Delegate methods
 
 - (void)setDelegate:(id <CPTextStorageDelegate>)aDelegate
 {
@@ -121,8 +121,8 @@ var CPTextStorageDelegate_textStorageWillProcessEditing_ = 1 << 1,
 }
 
 
-#pragma mark -
-#pragma mark Layout manager methods
+// MARK: -
+// MARK: Layout manager methods
 
 - (void)addLayoutManager:(CPLayoutManager)aManager
 {
@@ -148,8 +148,8 @@ var CPTextStorageDelegate_textStorageWillProcessEditing_ = 1 << 1,
 }
 
 
-#pragma mark -
-#pragma mark Editing methods
+// MARK: -
+// MARK: Editing methods
 
 - (void)processEditing
 {

AppKit/CPTextView/CPTextView.j

@@ -191,8 +191,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
     return editMenu;
 }
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 /* <!> FIXME
     just a testing characterSet
@@ -200,8 +200,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
     Need some CPLocale support and maybe even a FSM...
  */
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 - (id)initWithFrame:(CGRect)aFrame textContainer:(CPTextContainer)aContainer
 {
@@ -444,8 +444,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
         [self _becomeFirstResponder];
 }
 
-#pragma mark -
-#pragma mark Copy and paste methods
+// MARK: -
+// MARK: Copy and paste methods
 
 - (void)copy:(id)sender
 {
@@ -527,8 +527,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
     [self _pasteString:[self _stringForPasting]];
 }
 
-#pragma mark -
-#pragma mark Responders method
+// MARK: -
+// MARK: Responders method
 
 - (BOOL)acceptsFirstResponder
 {
@@ -587,8 +587,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
 }
 
 
-#pragma mark -
-#pragma mark Delegate methods
+// MARK: -
+// MARK: Delegate methods
 
 /*!
     TODO : documentation
@@ -647,8 +647,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
 }
 
 
-#pragma mark -
-#pragma mark Key window methods
+// MARK: -
+// MARK: Key window methods
 
 - (void)becomeKeyWindow
 {
@@ -674,8 +674,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
 }
 
 
-#pragma mark -
-#pragma mark Undo redo methods
+// MARK: -
+// MARK: Undo redo methods
 
 - (void)undo:(id)sender
 {
@@ -690,8 +690,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
 }
 
 
-#pragma mark -
-#pragma mark Accessors
+// MARK: -
+// MARK: Accessors
 
 - (CPString)stringValue
 {
@@ -805,8 +805,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
 }
 
 
-#pragma mark -
-#pragma mark Insert characters methods
+// MARK: -
+// MARK: Insert characters methods
 
 - (void)_fixupReplaceForRange:(CPRange)aRange
 {
@@ -864,8 +864,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
     _stickyXLocation = MAX(0, _caret._rect.origin.x - 1);
 }
 
-#pragma mark -
-#pragma mark Drawing methods
+// MARK: -
+// MARK: Drawing methods
 
 - (void)drawInsertionPointInRect:(CGRect)aRect color:(CPColor)aColor turnedOn:(BOOL)flag
 {
@@ -923,8 +923,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
 }
 
 
-#pragma mark -
-#pragma mark Select methods
+// MARK: -
+// MARK: Select methods
 
 - (void)selectAll:(id)sender
 {
@@ -1055,8 +1055,8 @@ Sets the selection to a range of characters in response to user action.
     return [_selectionRange];
 }
 
-#pragma mark -
-#pragma mark Keyboard events
+// MARK: -
+// MARK: Keyboard events
 
 - (void)keyDown:(CPEvent)event
 {
@@ -1124,8 +1124,8 @@ Sets the selection to a range of characters in response to user action.
     [placeholderString addAttribute:_CPAttachmentInvisible value:YES range:rangeToHide];
 }
 
-#pragma mark -
-#pragma mark Mouse Events
+// MARK: -
+// MARK: Mouse Events
 
 - (void)mouseDown:(CPEvent)event
 {
@@ -1847,8 +1847,8 @@ Sets the selection to a range of characters in response to user action.
 }
 
 
-#pragma mark -
-#pragma mark Font methods
+// MARK: -
+// MARK: Font methods
 
 - (CPFont)font
 {
@@ -1938,8 +1938,8 @@ Sets the selection to a range of characters in response to user action.
 }
 
 
-#pragma mark -
-#pragma mark Color methods
+// MARK: -
+// MARK: Color methods
 
 - (void)changeColor:(id)sender
 {
@@ -1974,8 +1974,8 @@ Sets the selection to a range of characters in response to user action.
     [_layoutManager textStorage:_textStorage edited:0 range:CPMakeRangeCopy(range) changeInLength:0 invalidatedRange:CPMakeRangeCopy(range)];
 }
 
-#pragma mark -
-#pragma mark Style & Alignment methods
+// MARK: -
+// MARK: Style & Alignment methods
 
 - (void)bold:(id)sender
 {
@@ -2383,8 +2383,8 @@ Sets the selection to a range of characters in response to user action.
     [_caret setVisibility:YES];
 }
 
-#pragma mark -
-#pragma mark Dragging operation
+// MARK: -
+// MARK: Dragging operation
 
 - (void)performDragOperation:(CPDraggingInfo)aSender
 {

AppKit/CPTextView/CPTypesetter.j

@@ -54,8 +54,8 @@ var CPSystemTypesetterFactory,
 @implementation CPTypesetter : CPObject
 
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 + (void)initialize
 {
@@ -122,8 +122,8 @@ var CPSystemTypesetterFactory,
 }
 
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 + (id)sharedInstance
 {

AppKit/CPTextView/_CPRTFProducer.j

@@ -70,8 +70,8 @@ function _points2twips(a) { return (a) * 20.0; }
     CPColor             ulColor;
 }
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 
 + (CPString)produceRTF:(CPAttributedString)aText documentAttributes:(CPDictionary)dict
@@ -82,8 +82,8 @@ function _points2twips(a) { return (a) * 20.0; }
 }
 
 
-#pragma mark -
-#pragma mark init methods
+// MARK: -
+// MARK: init methods
 
 - (id)init
 {

AppKit/CPTheme.j

@@ -319,8 +319,8 @@ var CPThemeNameKey          = @"CPThemeNameKey",
 
 @end
 
-#pragma mark -
-#pragma mark CSS Theming
+// MARK: -
+// MARK: CSS Theming
 
 // The code below adds support for CSS theming with 100% compatibility with current theming system.
 // The idea is to extend CPColor and CPImage with CSS components and adapt low level UI components to
@@ -556,7 +556,7 @@ var _savedThemesByName = { };
 
 @end
 
-#pragma mark -
+// MARK: -
 
 /*!
  * ThemeStates are immutable objects representing a particular ThemeState.  Applications should never be creating

AppKit/CPTokenField.j

@@ -169,8 +169,8 @@ CPTokenFieldDeleteButtonType     = 1;
     [self addSubview:_tokenScrollView];
 }
 
-#pragma mark -
-#pragma mark Delegate methods
+// MARK: -
+// MARK: Delegate methods
 
 /*!
     Set the delegate of the receiver

AppKit/CPTrackingArea.j

@@ -69,8 +69,8 @@ CPTrackingOwnerImplementsCursorUpdate = 1 << 4;
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 /*!
  Initializes and returns an object defining a region of a view to receive mouse-tracking events, mouse-moved events, cursor-update events, or possibly
@@ -121,8 +121,8 @@ CPTrackingOwnerImplementsCursorUpdate = 1 << 4;
 }
 
 
-#pragma mark -
-#pragma mark Implementation
+// MARK: -
+// MARK: Implementation
 
 - (void)_updateWindowRect
 {
@@ -140,8 +140,8 @@ CPTrackingOwnerImplementsCursorUpdate = 1 << 4;
 
 @end
 
-#pragma mark -
-#pragma mark CPCoding
+// MARK: -
+// MARK: CPCoding
 
 @implementation CPTrackingArea (CPCoding)
 

AppKit/CPView.j

@@ -3367,7 +3367,7 @@ setBoundsOrigin:
 
 @implementation CPView (Theming)
 
-#pragma mark Override
+// MARK: Override
 
 - (BOOL)setThemeState:(ThemeState)aState
 {
@@ -3404,7 +3404,7 @@ setBoundsOrigin:
 }
 
 
-#pragma mark First responder
+// MARK: First responder
 
 - (BOOL)becomeFirstResponder
 {
@@ -3466,7 +3466,7 @@ setBoundsOrigin:
         [_subviews[count] _notifyWindowDidResignKey];
 }
 
-#pragma mark Theme Attributes
+// MARK: Theme Attributes
 
 - (void)_setThemeIncludingDescendants:(CPTheme)aTheme
 {

AppKit/CPVisualEffectView.j

@@ -57,8 +57,8 @@ CPVisualEffectStateInactive                 = 2;
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 - (id)initWithFrame:(CGRect)aFrame
 {
@@ -74,8 +74,8 @@ CPVisualEffectStateInactive                 = 2;
 }
 
 
-#pragma mark -
-#pragma mark CPVisualEffectView API
+// MARK: -
+// MARK: CPVisualEffectView API
 
 /*! Sets the appearance of the CPVisualEffectView.
 
@@ -114,8 +114,8 @@ CPVisualEffectStateInactive                 = 2;
 }
 
 
-#pragma mark -
-#pragma mark Utilities
+// MARK: -
+// MARK: Utilities
 
 - (void)_setEffectEnabled:(BOOL)shouldEnable
 {
@@ -156,8 +156,8 @@ CPVisualEffectStateInactive                 = 2;
 }
 
 
-#pragma mark -
-#pragma mark CPCoding
+// MARK: -
+// MARK: CPCoding
 
 - (id)initWithCoder:(CPCoder)aCoder
 {
@@ -183,4 +183,4 @@ CPVisualEffectStateInactive                 = 2;
 }
 
 
-@end
+@end

AppKit/CPWindow/CPWindow.j

@@ -4455,7 +4455,7 @@ var interpolate = function(fromValue, toValue, progress)
 
 @end
 
-#pragma mark -
+// MARK: -
 
 @implementation CPWindow (CSSTheming)
 
@@ -4466,7 +4466,7 @@ var interpolate = function(fromValue, toValue, progress)
 
 @end
 
-#pragma mark -
+// MARK: -
 
 function _CPWindowFullPlatformWindowSessionMake(aWindowView, aContentRect, hasShadow, aLevel)
 {

AppKit/CPWindow/_CPToolTipWindowView.j

@@ -30,8 +30,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 + (CPString)defaultThemeClass
 {
@@ -80,8 +80,8 @@
 }
 
 
-#pragma mark -
-#pragma mark drawing
+// MARK: -
+// MARK: drawing
 
 - (void)drawRect:(CGRect)aRect
 {

AppKit/_CPObject+Theme.j

@@ -66,8 +66,8 @@ var CPViewThemeClassKey             = @"CPViewThemeClassKey",
 }
 
 
-#pragma mark -
-#pragma mark Theme State
+// MARK: -
+// MARK: Theme State
 
 - (unsigned)themeState
 {
@@ -155,7 +155,7 @@ var CPViewThemeClassKey             = @"CPViewThemeClassKey",
     return [self unsetThemeState:aState];
 }
 
-#pragma mark Theme Attributes
+// MARK: Theme Attributes
 
 + (CPString)defaultThemeClass
 {
@@ -494,8 +494,8 @@ var NULL_THEME = {};
     }
 }
 
-#pragma mark -
-#pragma mark CSS styling additions
+// MARK: -
+// MARK: CSS styling additions
 
 - (CPTheme)actualTheme
 {

AppKit/_CPPopUpList.j

@@ -210,7 +210,7 @@ var ListColumnIdentifier = @"1";
     CPTableColumn           _tableColumn;
 }
 
-#pragma mark Creating and Displaying a List
+// MARK: Creating and Displaying a List
 
 /*!
     Creates a pop up list of choices that will display in a scrollable CPTableView.
@@ -353,7 +353,7 @@ var ListColumnIdentifier = @"1";
     [self scrollItemAtIndexToTop:[_tableView selectedRow]];
 }
 
-#pragma mark Setting Display Attributes
+// MARK: Setting Display Attributes
 
 /*!
     Returns the desired width of the list.
@@ -448,7 +448,7 @@ var ListColumnIdentifier = @"1";
     return _panel;
 }
 
-#pragma mark Setting a Data Source
+// MARK: Setting a Data Source
 
 - (void)setDataSource:(_CPPopUpListDataSource)aDataSource
 {
@@ -468,7 +468,7 @@ var ListColumnIdentifier = @"1";
     return _dataSource;
 }
 
-#pragma mark Manipulating the Selection
+// MARK: Manipulating the Selection
 
 /*!
     Select the next item in the list if there one. If there is currently no selected item,
@@ -556,7 +556,7 @@ var ListColumnIdentifier = @"1";
         return NO;
 }
 
-#pragma mark Manipulating the Displayed List
+// MARK: Manipulating the Displayed List
 
 /*!
     Scroll the list down one page.
@@ -637,7 +637,7 @@ var ListColumnIdentifier = @"1";
     [[CPNotificationCenter defaultCenter] postNotificationName:_CPPopUpListItemWasClickedNotification object:self];
 }
 
-#pragma mark Handling Events
+// MARK: Handling Events
 
 /*!
     Handles standard key equivalents for moving the selection
@@ -785,7 +785,7 @@ var ListColumnIdentifier = @"1";
         return YES;
 }
 
-#pragma mark Internal Helpers
+// MARK: Internal Helpers
 
 /*! @ignore */
 - (void)listWillPopUp

AppKit/_CPPopoverWindow.j

@@ -74,8 +74,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
 }
 
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 /*!
     Overrides the default windowView class loader.
@@ -89,8 +89,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 /*!
     Create and init a _CPPopoverWindow with given the given frame.
@@ -138,8 +138,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
     return self;
 }
 
-#pragma mark -
-#pragma mark Getters / Setters
+// MARK: -
+// MARK: Getters / Setters
 
 - (void)setAppearance:(int)anAppearance
 {
@@ -177,8 +177,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
         _implementedDelegateMethods |= _CPPopoverWindow_didShow_;
 }
 
-#pragma mark -
-#pragma mark Observer
+// MARK: -
+// MARK: Observer
 
 /*!
     @ignore
@@ -236,8 +236,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
 }
 
 
-#pragma mark -
-#pragma mark Utilities
+// MARK: -
+// MARK: Utilities
 
 - (CGPoint)computeOriginFromRect:(CGRect)aRect ofView:(CPView)positioningView preferredEdge:(int)anEdge
 {
@@ -447,8 +447,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
     }
 }
 
-#pragma mark -
-#pragma mark Actions
+// MARK: -
+// MARK: Actions
 
 /*!
     @ignore
@@ -462,8 +462,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
 }
 
 
-#pragma mark -
-#pragma mark Overrides
+// MARK: -
+// MARK: Overrides
 
 /*!
     @ignore
@@ -697,8 +697,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
 }
 
 
-#pragma mark -
-#pragma mark Private
+// MARK: -
+// MARK: Private
 
 - (CPString)_currentTransformMatrix
 {

AppKit/_CPToolTip.j

@@ -45,8 +45,8 @@ var _CPToolTipHeight = 24.0,
 }
 
 
-#pragma mark -
-#pragma mark Class Methods
+// MARK: -
+// MARK: Class Methods
 
 /*! @ignore
     Invalidate any scheduled tooltips, or hide any visible one
@@ -160,8 +160,8 @@ var _CPToolTipHeight = 24.0,
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 /*!
     Returns an initialized _CPToolTip with string.
@@ -208,8 +208,8 @@ var _CPToolTipHeight = 24.0,
 }
 
 
-#pragma mark -
-#pragma mark Controls
+// MARK: -
+// MARK: Controls
 
 /*!
     Show the tooltip after computing the position.

Foundation/CPBundle.j

@@ -239,8 +239,8 @@ var CPBundlesForURLStrings = { };
 }
 
 
-#pragma mark -
-#pragma mark Localization
+// MARK: -
+// MARK: Localization
 
 - (CPArray)localizations
 {
@@ -267,4 +267,4 @@ function CPLocalizedStringFromTable(key, table, comment)
 function CPCopyLocalizedStringFromTableInBundle(key, table, bundle, comment)
 {
     return CFCopyLocalizedStringFromTableInBundle(key, table, bundle._bundle, comment);
-}
+}

Foundation/CPCache.j

@@ -74,8 +74,8 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
 }
 
 
-#pragma mark -
-#pragma mark Initialization
+// MARK: -
+// MARK: Initialization
 
 /*!
     Initializes the cache with default values
@@ -100,8 +100,8 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
 }
 
 
-#pragma mark -
-#pragma mark Managing cache
+// MARK: -
+// MARK: Managing cache
 
 /*!
     Returns the object which correspond to the given key
@@ -182,8 +182,8 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
 }
 
 
-#pragma mark -
-#pragma mark Setters
+// MARK: -
+// MARK: Setters
 
 /*!
     Sets the count limit of the cache.
@@ -224,8 +224,8 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
 }
 
 
-#pragma mark -
-#pragma mark Privates
+// MARK: -
+// MARK: Privates
 
 /*
  * This method return the number of objects in the cache

Foundation/CPDateFormatter.j

@@ -231,8 +231,8 @@ var _separatorsCharacterSet = nil;
 }
 
 
-#pragma mark -
-#pragma mark Setter Getter Helper
+// MARK: -
+// MARK: Setter Getter Helper
 
 /*! Return symbols for the given language code
 */
@@ -280,8 +280,8 @@ var _separatorsCharacterSet = nil;
     [languageSymbols setValue:aSymbol forKey:aKey];
 }
 
-#pragma mark -
-#pragma mark Setter Getter
+// MARK: -
+// MARK: Setter Getter
 
 /*! Return AMSymbol
 */
@@ -536,8 +536,8 @@ var _separatorsCharacterSet = nil;
 }
 
 
-#pragma mark -
-#pragma mark StringFromDate methods
+// MARK: -
+// MARK: StringFromDate methods
 
 /*! Return a string representation of a given date.
     This method returns (if possible) a representation of the given date with the dateFormat of the CPDateFormatter, otherwise it takes the dateStyle and timeStyle
@@ -1160,8 +1160,8 @@ var _separatorsCharacterSet = nil;
 }
 
 
-#pragma mark -
-#pragma mark datefromString
+// MARK: -
+// MARK: datefromString
 
 /*! Return a date of the given string
     This method returns (if possible) a representation of the given string with the dateFormat of the CPDateFormatter, otherwise it takes the dateStyle and timeStyle
@@ -1922,8 +1922,8 @@ var _separatorsCharacterSet = nil;
 }
 
 
-#pragma mark -
-#pragma mark Utils
+// MARK: -
+// MARK: Utils
 
 - (CPString)_stringValueForValue:(id)aValue length:(int)length
 {

Foundation/CPIndexPath.j

@@ -70,8 +70,8 @@
     return [super description] + " " + _indexes;
 }
 
-#pragma mark -
-#pragma mark Accessing
+// MARK: -
+// MARK: Accessing
 
 - (id)length
 {
@@ -93,8 +93,8 @@
     return [_indexes copy];
 }
 
-#pragma mark -
-#pragma mark Modification
+// MARK: -
+// MARK: Modification
 
 - (CPIndexPath)indexPathByAddingIndex:(int)index
 {
@@ -106,8 +106,8 @@
     return [CPIndexPath indexPathWithIndexes:_indexes length:[self length] - 1];
 }
 
-#pragma mark -
-#pragma mark Comparison
+// MARK: -
+// MARK: Comparison
 
 - (BOOL)isEqual:(id)anObject
 {

Foundation/CPMapTable.j

@@ -29,8 +29,8 @@
     return self;
 }
 
-#pragma mark -
-#pragma mark Accessing Content
+// MARK: -
+// MARK: Accessing Content
 
 /*!
    Returns the value associated with a given key.
@@ -70,8 +70,8 @@
     return _map.size;
 }
 
-#pragma mark -
-#pragma mark Manipulating Content
+// MARK: -
+// MARK: Manipulating Content
 
 /*!
    Adds a given key-value pair to the map table.
@@ -101,8 +101,8 @@
     _map.clear();
 }
 
-#pragma mark -
-#pragma mark Creating a Dictionary Representation
+// MARK: -
+// MARK: Creating a Dictionary Representation
 
 /*!
    Returns a dictionary representation of the map table.

Foundation/CPNotificationQueue.j

@@ -98,8 +98,8 @@ var runLoop = [CPRunLoop mainRunLoop];
 }
 
 
-#pragma mark -
-#pragma mark Class methods
+// MARK: -
+// MARK: Class methods
 
 /*!
     Returns the application's notification queue. This notification queue uses the default notification center
@@ -113,8 +113,8 @@ var runLoop = [CPRunLoop mainRunLoop];
 }
 
 
-#pragma mark -
-#pragma mark Init methods
+// MARK: -
+// MARK: Init methods
 
 /*!
     Initializes and returns a notification queue for the specified notification center.
@@ -135,8 +135,8 @@ var runLoop = [CPRunLoop mainRunLoop];
 }
 
 
-#pragma mark -
-#pragma mark Enqueue methods
+// MARK: -
+// MARK: Enqueue methods
 
 /*!
     Adds a notification to the notification queue with a specified posting style.
@@ -185,8 +185,8 @@ var runLoop = [CPRunLoop mainRunLoop];
 }
 
 
-#pragma mark -
-#pragma mark Dequeue methods
+// MARK: -
+// MARK: Dequeue methods
 
 /*!
     Removes all notifications from the queue that match a provided notification using provided matching criteria.
@@ -199,8 +199,8 @@ var runLoop = [CPRunLoop mainRunLoop];
 }
 
 
-#pragma mark -
-#pragma mark RunLoop methods
+// MARK: -
+// MARK: RunLoop methods
 
 /*!
     @ignore
@@ -244,8 +244,8 @@ var runLoop = [CPRunLoop mainRunLoop];
 }
 
 
-#pragma mark -
-#pragma mark Posting methods
+// MARK: -
+// MARK: Posting methods
 
 /*!
     @ignore
@@ -262,8 +262,8 @@ var runLoop = [CPRunLoop mainRunLoop];
 }
 
 
-#pragma mark -
-#pragma mark Remove methods
+// MARK: -
+// MARK: Remove methods
 
 /*!
     @ignore
@@ -325,4 +325,4 @@ var runLoop = [CPRunLoop mainRunLoop];
     [notifications removeObjectsInArray:notificationsToRemove];
 }
 
-@end
+@end

Foundation/CPNumberFormatter.j

@@ -273,7 +273,7 @@ var NumberRegex = new RegExp('(-)?(\\d*)(\\.(\\d*))?');
     SET_NEEDS_NUMBER_HANDLER_UPDATE();
 }
 
-#pragma mark Private
+// MARK: Private
 
 - (void)_updateNumberHandlerIfNecessary
 {

Foundation/CPTimeZone.j

@@ -377,8 +377,8 @@ function _abbreviationForNameAndDate(tzName, date)
 }
 
 
-#pragma mark -
-#pragma mark Class constructor
+// MARK: -
+// MARK: Class constructor
 
 /*! Returns a time zone from the given abbreviation.
     Returns nil if the given abbreviation doesn't match with any abbreviations
@@ -482,8 +482,8 @@ function _abbreviationForNameAndDate(tzName, date)
     return array;
 }
 
-#pragma mark -
-#pragma mark Class accessors
+// MARK: -
+// MARK: Class accessors
 
 /*! Return the timeZoneDataVersion (not yet implemented)
 */
@@ -558,8 +558,8 @@ function _abbreviationForNameAndDate(tzName, date)
 }
 
 
-#pragma mark -
-#pragma mark Consructors
+// MARK: -
+// MARK: Consructors
 
 /*! Init a new time zone with the given time zone name and abbreviation
     Returns nil if tzName doesn't match with any timeZoneNames or if abbreviation is nil
@@ -658,8 +658,8 @@ function _abbreviationForNameAndDate(tzName, date)
 }
 
 
-#pragma mark -
-#pragma mark Methods for CPDate
+// MARK: -
+// MARK: Methods for CPDate
 
 /*! Returns the abbreviation from a date
     Returns nil if the date is nil
@@ -697,8 +697,8 @@ function _abbreviationForNameAndDate(tzName, date)
 }
 
 
-#pragma mark -
-#pragma mark Compars methods
+// MARK: -
+// MARK: Compars methods
 
 /*! Returns a bool to compare tow timeZones.
     This is made by the compare of the name and the data of the timeZones
@@ -710,8 +710,8 @@ function _abbreviationForNameAndDate(tzName, date)
 }
 
 
-#pragma mark -
-#pragma mark Description
+// MARK: -
+// MARK: Description
 
 /*! Returns the description of the timeZone
     The pattern of the description is : 'name of the timeZone' ('abbreviation of the timeZone') offset 'the timeDifferenceFromGMT'
@@ -723,8 +723,8 @@ function _abbreviationForNameAndDate(tzName, date)
 }
 
 
-#pragma mark -
-#pragma mark Localized methods
+// MARK: -
+// MARK: Localized methods
 
 /*! Return a localized string from the given style and locale
     @param style the style

Foundation/CPUserDefaults.j

@@ -381,7 +381,7 @@ var StandardUserDefaults;
     }
 }
 
-#pragma mark Getting Default Values
+// MARK: Getting Default Values
 
 /*!
     Returns the array value associated with the specified key.
@@ -517,7 +517,7 @@ var StandardUserDefaults;
     return nil;
 }
 
-#pragma mark Setting Default Values
+// MARK: Setting Default Values
 
 /*!
     Sets the value of the specified default key to the specified Boolean value.

Foundation/CPUserNotification.j

@@ -91,8 +91,8 @@ CPUserNotificationActivationTypeAdditionalActionClicked = 4;
 }
 
 
-#pragma mark -
-#pragma mark Creating an user notification
+// MARK: -
+// MARK: Creating an user notification
 
 - (id)init
 {
@@ -106,4 +106,4 @@ CPUserNotificationActivationTypeAdditionalActionClicked = 4;
     return self
 }
 
-@end
+@end

Foundation/CPUserNotificationCenter.j

@@ -62,8 +62,8 @@ var CPUserNotificationDefaultCenter = nil;
 }
 
 
-#pragma mark -
-#pragma mark Creating Default User Notification Center
+// MARK: -
+// MARK: Creating Default User Notification Center
 
 /*!
     Returns the user's notification center
@@ -91,8 +91,8 @@ var CPUserNotificationDefaultCenter = nil;
 }
 
 
-#pragma mark -
-#pragma mark Getting and Setting the Delegate
+// MARK: -
+// MARK: Getting and Setting the Delegate
 
 - (void)setDelegate:(id <CPUserNotificationCenterDelegate>)aDelegate
 {
@@ -113,8 +113,8 @@ var CPUserNotificationDefaultCenter = nil;
 }
 
 
-#pragma mark -
-#pragma mark Managing the Scheduled Notification Queue
+// MARK: -
+// MARK: Managing the Scheduled Notification Queue
 
 /*!
     Schedules the given user notification
@@ -158,8 +158,8 @@ var CPUserNotificationDefaultCenter = nil;
 }
 
 
-#pragma mark -
-#pragma mark Managing the Delivered Notifications
+// MARK: -
+// MARK: Managing the Delivered Notifications
 
 /*!
     Deliver the given user notification
@@ -188,8 +188,8 @@ var CPUserNotificationDefaultCenter = nil;
 }
 
 
-#pragma mark -
-#pragma mark Permission Utilities
+// MARK: -
+// MARK: Permission Utilities
 
 - (void)_askPermissionForUserNotification:(CPUserNotification)anUserNotification
 {
@@ -201,8 +201,8 @@ var CPUserNotificationDefaultCenter = nil;
 }
 
 
-#pragma mark -
-#pragma mark Notification Utilities
+// MARK: -
+// MARK: Notification Utilities
 
 - (void)_launchUserNotification:(CPUserNotification)anUserNotification
 {
@@ -290,4 +290,4 @@ var CPUserNotificationDefaultCenter = nil;
     [_delegate userNotificationCenter:self didDeliverNotification:aNotification];
 }
 
-@end
+@end

Objective-J/Preprocessor.js

@@ -377,7 +377,7 @@ Preprocessor.prototype.hash = function(tokens, aStringBuffer)
     {
         token = tokens.skip_whitespace();
 
-        // '#pragma mark' directive is used in Xcode editor for creating labels,
+        // '// MARK:' directive is used in Xcode editor for creating labels,
         // which is irrelevant to Cappuccino - just swallow this line
         if (token === TOKEN_MARK)
         {

Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j

@@ -140,7 +140,7 @@
     [self assert:[track volume] equals:[slider floatValue]];
 }
 
-#pragma mark ----- actions used by implementation 01 -----
+// MARK: ----- actions used by implementation 01 -----
 
 - (void)updateVolumeFrom:(id)sender
 {
@@ -161,7 +161,7 @@
     [self updateUserInterface];
 }
 
-#pragma mark ----- actions used by implementation 02 and 03 -----
+// MARK: ----- actions used by implementation 02 and 03 -----
 
 - (void)muteTrack:(id)sender
 {

Tests/AppKit/CPTokenFieldTest.j

@@ -31,8 +31,8 @@
 
 }
 
-#pragma mark -
-#pragma mark Test creation
+// MARK: -
+// MARK: Test creation
 
 - (void)testArchiving
 {
@@ -57,8 +57,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Test objectValue and stringValue
+// MARK: -
+// MARK: Test objectValue and stringValue
 
 /*!
     This is totally different than cocoa
@@ -82,8 +82,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Delegate methods
+// MARK: -
+// MARK: Delegate methods
 
 - (void)testDelegateDisplayStringForRepresentedObject
 {

Tests/Foundation/CPDateFormatterTest.j

@@ -52,8 +52,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Setter
+// MARK: -
+// MARK: Setter
 
 - (void)testSetterAMSymbol
 {
@@ -163,8 +163,8 @@
     [self assert:[_dateFormatter shortStandaloneQuarterSymbols] equals:[@"Hej hej"]];
 }
 
-#pragma mark -
-#pragma mark string from date
+// MARK: -
+// MARK: string from date
 
 - (void)testLocalizedStringFromDate
 {
@@ -446,8 +446,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Date From string
+// MARK: -
+// MARK: Date From string
 
 - (void)testDateFromStringToken
 {
@@ -1328,8 +1328,8 @@
     [self assert:error equals:@"The value \"ezr 12\" is invalid."];
 }
 
-#pragma mark -
-#pragma mark non-en locales
+// MARK: -
+// MARK: non-en locales
 
 // Unless we have full locale support any non-supported locale should return the english values as they are the only defined ones at the moment.
 

Tests/Manual/CPPlatformWindow/AppController.j

@@ -76,8 +76,8 @@
 }
 
 
-#pragma mark -
-#pragma mark Delegate
+// MARK: -
+// MARK: Delegate
 
 - (void)windowDidBecomeKey:(CPNotification)aNotification
 {

Tests/Manual/CPPopover/AppController.j

@@ -226,8 +226,8 @@
     [aPopover setAppearance:appearance];
 }
 
-#pragma mark -
-#pragma mark CPPopover Delegate
+// MARK: -
+// MARK: CPPopover Delegate
 
 - (void)popoverWillShow:(CPPopover)aPopover
 {

Tests/Manual/CPStackViewTest/AppController.j

@@ -141,8 +141,8 @@
     // If we were using a Cib, initialization would happen here.
 }
 
-#pragma mark -
-#pragma mark Actions
+// MARK: -
+// MARK: Actions
 
 - (@action)toggleHidden:(id)sender
 {
@@ -183,8 +183,8 @@
     [stackViewHorizontal setSpacing:(current >= 20.0 ? 8.0 : current + 4.0)];
 }
 
-#pragma mark -
-#pragma mark Helpers
+// MARK: -
+// MARK: Helpers
 
 - (CPView)_createBoxColor:(CPColor)aColor size:(CGSize)aSize label:(CPString)text
 {

Tests/Manual/ScalingTest2/AppController.j

@@ -33,7 +33,7 @@
     [[self scrollView] setDocumentView:pagePreview];
 }
 
-#pragma mark - Window delegate methods
+// MARK: - Window delegate methods
 - (CGSize)windowWillResize:(CPWindow)theWindow toSize:(CPSize)frameSize
 {
     if (![self pagePreviewBox])