From 8c9d0f1640b7133977d73285e6b103158bbe7653 Mon Sep 17 00:00:00 2001 From: Neil Hodgson Date: Fri, 8 Apr 2016 10:49:16 +1000 Subject: Update header ordering to cover all headers used in Scintilla and reorder in Cocoa source consistently. --- cocoa/PlatCocoa.h | 3 ++- cocoa/PlatCocoa.mm | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'cocoa') diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index 60977c92e..0465cb4c8 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -16,11 +16,12 @@ #include #include -#include "QuartzTextLayout.h" #include "Platform.h" #include "Scintilla.h" +#include "QuartzTextLayout.h" + NSRect PRectangleToNSRect(Scintilla::PRectangle& rc); Scintilla::PRectangle NSRectToPRectangle(NSRect& rc); CFStringEncoding EncodingFromCharacterSet(bool unicode, int characterSet); diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 60eac53dc..82a172e3f 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -26,13 +26,14 @@ #import #import "Platform.h" -#import "ScintillaView.h" -#import "ScintillaCocoa.h" -#import "PlatCocoa.h" #include "StringCopy.h" #include "XPM.h" +#import "ScintillaView.h" +#import "ScintillaCocoa.h" +#import "PlatCocoa.h" + using namespace Scintilla; extern sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam); -- cgit v1.2.3