diff options
| -rw-r--r-- | cocoa/InfoBar.mm | 4 | ||||
| -rw-r--r-- | cocoa/PlatCocoa.mm | 14 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 8 | ||||
| -rw-r--r-- | cocoa/ScintillaView.mm | 14 |
5 files changed, 21 insertions, 21 deletions
diff --git a/cocoa/InfoBar.mm b/cocoa/InfoBar.mm index 5561bb059..bb80bd33d 100644 --- a/cocoa/InfoBar.mm +++ b/cocoa/InfoBar.mm @@ -103,7 +103,7 @@ //-------------------------------------------------------------------------------------------------- /** - * Called by a connected compontent (usually the info bar) if something changed there. + * Called by a connected component (usually the info bar) if something changed there. * * @param type The type of the notification. * @param message Carries the new status message if the type is a status message change. @@ -427,7 +427,7 @@ static float BarFontSize = 10.0; //-------------------------------------------------------------------------------------------------- /** - * Makes the bar resize to the smallest width that can accomodate the currently enabled items. + * Makes the bar resize to the smallest width that can accommodate the currently enabled items. */ - (void) sizeToFit { diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 2d29bf2be..3ce5abe0e 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -55,7 +55,7 @@ PRectangle NSRectToPRectangle(NSRect& rc) //-------------------------------------------------------------------------------------------------- /** - * Converts a PRctangle as used by Scintilla to a Quartz-style rectangle. + * Converts a PRectangle as used by Scintilla to a Quartz-style rectangle. */ inline CGRect PRectangleToCGRect(PRectangle& rc) { @@ -196,10 +196,10 @@ bool SurfaceImpl::Initialised() void SurfaceImpl::Init(WindowID) { // To be able to draw, the surface must get a CGContext handle. We save the graphics port, - // then aquire/release the context on an as-need basis (see above). + // then acquire/release the context on an as-need basis (see above). // XXX Docs on QDBeginCGContext are light, a better way to do this would be good. // AFAIK we should not hold onto a context retrieved this way, thus the need for - // aquire/release of the context. + // acquire/release of the context. Release(); } @@ -387,7 +387,7 @@ void SurfaceImpl::LineTo(int x_, int y_) // Because Quartz is based on floating point, lines are drawn with half their colour // on each side of the line. Integer coordinates specify the INTERSECTION of the pixel - // divison lines. If you specify exact pixel values, you get a line that + // division lines. If you specify exact pixel values, you get a line that // is twice as thick but half as intense. To get pixel aligned rendering, // we render the "middle" of the pixels by adding 0.5 to the coordinates. CGContextMoveToPoint( gc, x + 0.5, y + 0.5 ); @@ -1869,7 +1869,7 @@ ListBox* ListBox::Allocate() @implementation ScintillaContextMenu : NSMenu // This NSMenu subclass serves also as target for menu commands and forwards them as -// notfication messages to the front end. +// notification messages to the front end. - (void) handleCommand: (NSMenuItem*) sender { @@ -1984,7 +1984,7 @@ int Platform::DefaultFontSize() //-------------------------------------------------------------------------------------------------- /** - * Returns the time span in which two consequtive mouse clicks must occur to be considered as + * Returns the time span in which two consecutive mouse clicks must occur to be considered as * double click. * * @return @@ -2159,7 +2159,7 @@ int Platform::Clamp(int val, int minVal, int maxVal) * Implements the platform specific part of library loading. * * @param modulePath The path to the module to load. - * @return A library instance or NULL if the module could not be found or another problem occured. + * @return A library instance or NULL if the module could not be found or another problem occurred. */ DynamicLibrary* DynamicLibrary::Load(const char* /* modulePath */) { diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 9b2c9fa1e..b7290506b 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -91,7 +91,7 @@ namespace Scintilla { typedef void(*SciNotifyFunc) (intptr_t windowid, unsigned int iMessage, uintptr_t wParam, uintptr_t lParam); /** - * Scintilla sends these two messages to the nofity handler. Please refer + * Scintilla sends these two messages to the notify handler. Please refer * to the Windows API doc for details about the message format. */ #define WM_COMMAND 1001 diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 5c378c903..38dc792a7 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -731,7 +731,7 @@ Scintilla::Point ScintillaCocoa::ConvertPoint(NSPoint point) /** * A function to directly execute code that would usually go the long way via window messages. - * However this is a Windows metapher and not used here, hence we just call our fake + * However this is a Windows metaphor and not used here, hence we just call our fake * window proc. The given parameters directly reflect the message parameters used on Windows. * * @param sciThis The target which is to be called. @@ -766,7 +766,7 @@ sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, s * commands (also used to synchronize UI and background threads), which is not the case in Cocoa. * * Messages handled here are almost solely for special commands of the backend. Everything which - * would be sytem messages on Windows (e.g. for key down, mouse move etc.) are handled by + * would be system messages on Windows (e.g. for key down, mouse move etc.) are handled by * directly calling appropriate handlers. */ sptr_t ScintillaCocoa::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) @@ -1679,7 +1679,7 @@ void ScintillaCocoa::UpdateForScroll() { /** * Used to register a callback function for a given window. This is used to emulate the way - * Windows notfies other controls (mainly up in the view hierarchy) about certain events. + * Windows notifies other controls (mainly up in the view hierarchy) about certain events. * * @param windowid A handle to a window. That value is generic and can be anything. It is passed * through to the callback. @@ -1869,7 +1869,7 @@ bool ScintillaCocoa::KeyboardInput(NSEvent* event) bool handled = false; - // Handle each entry individually. Usually we only have one entry anway. + // Handle each entry individually. Usually we only have one entry anyway. for (size_t i = 0; i < input.length; i++) { const UniChar originalKey = [input characterAtIndex: i]; diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index 28b7914d5..8abc37308 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -374,7 +374,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) if (replacementRange.location == (NSNotFound-1)) // This occurs when the accent popup is visible and menu selected. - // Its replacing a non-existant position so do nothing. + // Its replacing a non-existent position so do nothing. return; if (replacementRange.length > 0) @@ -1001,7 +1001,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa } case SCN_ZOOM: { - // A zoom change happend. Notify info bar if there is one. + // A zoom change happened. Notify info bar if there is one. float zoom = [editor getGeneralProperty: SCI_GETZOOM parameter: 0]; long fontSize = [editor getGeneralProperty: SCI_STYLEGETSIZE parameter: STYLE_DEFAULT]; float factor = (zoom / fontSize) + 1; @@ -1650,7 +1650,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa //-------------------------------------------------------------------------------------------------- /** - * Searches and marks the first occurance of the given text and optionally scrolls it into view. + * Searches and marks the first occurrence of the given text and optionally scrolls it into view. * * @result YES if something was found, NO otherwise. */ @@ -1670,7 +1670,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa int selectionStart = [self getGeneralProperty: SCI_GETSELECTIONSTART parameter: 0]; int selectionEnd = [self getGeneralProperty: SCI_GETSELECTIONEND parameter: 0]; - // Sets the start point for the comming search to the begin of the current selection. + // Sets the start point for the coming search to the beginning of the current selection. // For forward searches we have therefore to set the selection start to the current selection end // for proper incremental search. This does not harm as we either get a new selection if something // is found or the previous selection is restored. @@ -1745,13 +1745,13 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa wholeWord: (BOOL) wholeWord doAll: (BOOL) doAll { - // The current position is where we start searching for single occurences. Otherwise we start at + // The current position is where we start searching for single occurrences. Otherwise we start at // the beginning of the document. int startPosition; if (doAll) startPosition = 0; // Start at the beginning of the text if we replace all occurrences. else - // For a signle replacement we start at the current caret position. + // For a single replacement we start at the current caret position. startPosition = [self getGeneralProperty: SCI_GETCURRENTPOS]; int endPosition = [self getGeneralProperty: SCI_GETTEXTLENGTH]; @@ -1788,7 +1788,7 @@ static void notification(intptr_t windowid, unsigned int iMessage, uintptr_t wPa wParam: targetLength lParam: (sptr_t) replacement]; - // The replacement changes the target range to the replaced text. Continue after that til the end. + // The replacement changes the target range to the replaced text. Continue after that till the end. // The text length might be changed by the replacement so make sure the target end is the actual // text end. [self setGeneralProperty: SCI_SETTARGETSTART value: [self getGeneralProperty: SCI_GETTARGETEND]]; |