diff options
| author | nyamatongwe <nyamatongwe@gmail.com> | 2013-03-10 21:22:44 +1100 |
|---|---|---|
| committer | nyamatongwe <nyamatongwe@gmail.com> | 2013-03-10 21:22:44 +1100 |
| commit | 18b2a164809aba4f6b5466e60e548aec6354e007 (patch) | |
| tree | 99e1bc336fcfd8b8fefd3cdac6bf5f268ea9aa3d | |
| parent | ded6ea3c133c7c591bc82670a4e1e4174fca033f (diff) | |
| download | scintilla-mirror-18b2a164809aba4f6b5466e60e548aec6354e007.tar.gz | |
Remove remnants of Carbon.
| -rw-r--r-- | cocoa/PlatCocoa.mm | 7 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 901ce4f7d..1ef438a06 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -28,8 +28,6 @@ #import <Foundation/NSGeometry.h> -#import <Carbon/Carbon.h> // Temporary - using namespace Scintilla; extern sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam); @@ -1488,7 +1486,6 @@ typedef std::map<NSInteger, NSImage*> ImageMap; class ListBoxImpl : public ListBox, IListBox { private: - ControlRef lb; ImageMap images; int lineHeight; bool unicodeMode; @@ -1510,7 +1507,7 @@ private: void* doubleClickActionData; public: - ListBoxImpl() : lb(NULL), lineHeight(10), unicodeMode(false), + ListBoxImpl() : lineHeight(10), unicodeMode(false), desiredVisibleRows(5), maxItemWidth(0), aveCharWidth(8), maxIconWidth(0), doubleClickAction(NULL), doubleClickActionData(NULL) { @@ -2010,7 +2007,7 @@ unsigned int Platform::DoubleClickTime() @"com.apple.mouse.doubleClickThreshold"]; if (threshold == 0) threshold = 0.5; - return static_cast<unsigned int>(threshold / kEventDurationMillisecond); + return static_cast<unsigned int>(threshold * 1000.0); } //-------------------------------------------------------------------------------------------------- diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 0a0b2597b..42d9c8adf 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -21,8 +21,6 @@ #import <QuartzCore/CAAnimation.h> #import <QuartzCore/CATransaction.h> -#import <Carbon/Carbon.h> // Temporary - #include "ScintillaView.h" #include "PlatCocoa.h" |