diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2016-04-08 10:49:16 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2016-04-08 10:49:16 +1000 |
| commit | 8c9d0f1640b7133977d73285e6b103158bbe7653 (patch) | |
| tree | c9ee5c488bdcdc04500f8ad9fd3231d50d193c4a /cocoa | |
| parent | 0d20c56f749576c60c54410985cd31aa27120231 (diff) | |
| download | scintilla-mirror-8c9d0f1640b7133977d73285e6b103158bbe7653.tar.gz | |
Update header ordering to cover all headers used in Scintilla and reorder
in Cocoa source consistently.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/PlatCocoa.h | 3 | ||||
| -rw-r--r-- | cocoa/PlatCocoa.mm | 7 |
2 files changed, 6 insertions, 4 deletions
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 <cstdio> #include <Cocoa/Cocoa.h> -#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 <Foundation/NSGeometry.h> #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); |