diff options
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/PlatCocoa.h | 8 | ||||
| -rw-r--r-- | cocoa/PlatCocoa.mm | 20 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 8 | 
3 files changed, 19 insertions, 17 deletions
| diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index 06b7a1f5b..60977c92e 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -7,14 +7,14 @@  #ifndef PLATCOCOA_H  #define PLATCOCOA_H -#include <cstring> -#include <cstdio> -#include <cstdlib> -  #include <assert.h>  #include <sys/time.h> +#include <cstdlib> +#include <cstring> +#include <cstdio> +  #include <Cocoa/Cocoa.h>  #include "QuartzTextLayout.h" diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index a0a0e8943..2225631a6 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -12,25 +12,27 @@   * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).   */ -#import "Platform.h" -#import "ScintillaView.h" -#import "ScintillaCocoa.h" -#import "PlatCocoa.h" +#include <assert.h> +#include <sys/time.h> +#include <cstdlib>  #include <cstring>  #include <cstdio> -#include <cstdlib> -#include <assert.h> -#include <sys/time.h> +  #include <stdexcept>  #include <vector>  #include <map> +#import <Foundation/NSGeometry.h> + +#import "Platform.h" +#import "ScintillaView.h" +#import "ScintillaCocoa.h" +#import "PlatCocoa.h" +  #include "StringCopy.h"  #include "XPM.h" -#import <Foundation/NSGeometry.h> -  using namespace Scintilla;  extern sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam); diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 7e4ed7214..8fa2d196b 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -14,11 +14,11 @@   */  #include <stdlib.h> -#include <string>  #include <stdio.h> -#include <ctype.h>  #include <time.h> +#include <ctype.h> +#include <string>  #include <vector>  #include <map> @@ -40,18 +40,18 @@  #include "XPM.h"  #include "LineMarker.h"  #include "Style.h" -#include "AutoComplete.h"  #include "ViewStyle.h"  #include "CharClassify.h"  #include "Decoration.h"  #include "CaseFolder.h"  #include "Document.h" +#include "CaseConvert.h"  #include "Selection.h"  #include "PositionCache.h"  #include "Editor.h" +#include "AutoComplete.h"  #include "ScintillaBase.h" -#include "CaseConvert.h"  extern "C" NSString* ScintillaRecPboardType; | 
