Skip to content

misc: fix spelling #2183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bundles/org.eclipse.swt.tools/gtk/clone_build_gtk_debug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func_echo_info "You are in: $(pwd)"
if [ "$SILENT" == "false" ]; then
func_echo_input "Currently gtk is on branch:"
git branch
func_echo_input "Its reccomended to checkout a version of GTK that
func_echo_input "Its recommended to checkout a version of GTK that
is found on your system, because 'master' usually requires very new upstream libraries.
To find out which version of Gtk3 is on your system, you can check your package manager. Ex on fedora:
sudo dnf list installed | grep '^gtk3\.'
Expand All @@ -114,7 +114,7 @@ To checkout a particular gtk branch:
git branch -r | grep gtk-3
git checkout origin/gtk-3-22
Shall I continue (y)? (You can checkout the required branch in another terminal tab.
(To avoid seesing this message, try running this script with '-y'"
(To avoid seeing this message, try running this script with '-y'"

read -p "[y/n]: "
if [ ! "$REPLY" == y ]; then
Expand All @@ -127,7 +127,7 @@ fi
cd "$GTK_SRC_DIR"
if [ "$NOCLEANUP" == false ]; then
func_echo_info "Cleanup old gtk build files.
This is needed if switching between gtk version to avoid compiliation issues."
This is needed if switching between gtk version to avoid compilation issues."
git clean -xdf # remove build files.
git reset --hard # undo changes to existing source files.
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ public void createFunction (BrowserFunction function) {
}

/**
* Designed to be overriden.
* @return javaScrit code that defines the 'callJava' syntax for javascript.
* Designed to be overridden.
* @return javaScript code that defines the 'callJava' syntax for javascript.
*/
String getJavaCallDeclaration() {
return "if (!window.callJava) {\n"
Expand All @@ -393,7 +393,7 @@ public void destroyFunction (BrowserFunction function) {
deregisterFunction (function);
}

// Designed to be overriden by platform implementations, used for optimization and avoiding deadlocks.
// Designed to be overridden by platform implementations, used for optimization and avoiding deadlocks.
// Webkit2 is async, we often don't need to bother waiting for a return type if we never use it.
void nonBlockingExecute(String script) {
execute(script);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3649,7 +3649,7 @@ public void setItemCount (int count) {
*/
public void setLinesVisible (boolean show) {
checkWidget();
//Note: this is overriden by the active theme in GTK3.
//Note: this is overridden by the active theme in GTK3.
GTK.gtk_tree_view_set_grid_lines (handle, show ? GTK.GTK_TREE_VIEW_GRID_LINES_VERTICAL : GTK.GTK_TREE_VIEW_GRID_LINES_NONE);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3818,7 +3818,7 @@ public void setHeaderVisible (boolean show) {
*/
public void setLinesVisible (boolean show) {
checkWidget();
//Note: this is overriden by the active theme in GTK3.
//Note: this is overridden by the active theme in GTK3.
GTK.gtk_tree_view_set_grid_lines (handle, show ? GTK.GTK_TREE_VIEW_GRID_LINES_VERTICAL : GTK.GTK_TREE_VIEW_GRID_LINES_NONE);
}

Expand Down
12 changes: 6 additions & 6 deletions docs/gtk-dev-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ You should learn at least:

Widget is the main Widget. Everything else extends Widget. The most interesting classes are Widget, Control and Composite. Most widgets fork off of these.

As such, it is useful to be aware of fields/methods in parent classes and which methods get overriden by children. In Eclipse, you can Ctrl+click on a method to see it's super implementation, or derived implementations (this is very useful).
As such, it is useful to be aware of fields/methods in parent classes and which methods get overridden by children. In Eclipse, you can Ctrl+click on a method to see it's super implementation, or derived implementations (this is very useful).

This list below shows the widget hierarchy:

Expand Down Expand Up @@ -281,11 +281,11 @@ These are typically wrapped in a lock:

**Constants and ENUMS**

C constants and C Enums are delcared as plain ints. like so:
C constants and C Enums are declared as plain ints. like so:

public static final int GTK_SCROLL_STEP_UP = 6;

*Note: If you need to add a C enum to OS.java, C ENUMS (Enumirations) begin at 0. Do note, that the Javadoc is parsed by the JNI parser. So be careful about what you put in there.*
*Note: If you need to add a C enum to OS.java, C ENUMS (Enumerations) begin at 0. Do note, that the Javadoc is parsed by the JNI parser. So be careful about what you put in there.*

**Static Strings translated to C-bytes**

Expand Down Expand Up @@ -441,7 +441,7 @@ C enums don't map onto Java's enums. Instead, to add an enum like GtkAlign to OS
public static final int GTK_ALIGN_CENTER = 3;
public static final int GTK_ALIGN_BASELINE = 4;

And when you declare a function, delcare the java-doc parameter cast like this:
And when you declare a function, declare the java-doc parameter cast like this:

@param gtkalign cast=(GtkAlign) // note (GtkAlign) with no pointer, not (GtkAlign *)

Expand Down Expand Up @@ -878,7 +878,7 @@ Now click on OK. Right click on your project -> Indexer -> Rebuild index. Now yo

**Debugging GTK applications**

Besides stepping through a GTK appliction, you also use the GtkInspector, which can be ran for a GTK3.14+ application to see real-time information about your running GTK application.
Besides stepping through a GTK application, you also use the GtkInspector, which can be ran for a GTK3.14+ application to see real-time information about your running GTK application.

You can set launch flags to help debug GTK apps as well as SWT snippets. Set the following global variable to get detailed frame-sizes:

Expand Down Expand Up @@ -935,7 +935,7 @@ Inside the GTK code base somewhere, set a break point in a common area:

gtkmain.c:gtk_main_do_event(GdkEvent *event) #This will be triggered an almost every GDK event

Launch your SWT application. In terminal execute jps (java proccesses) and identify the PID of your SWT appplication.
Launch your SWT application. In terminal execute jps (java processes) and identify the PID of your SWT application.

lufimtse@unused-10-15-18-183 pathscripts$ jps
357 Jps
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

/**
* A Layout class that automatically switches from a horizontal split to a vertical
* split layout to accomodate changing size conditions.
* split layout to accommodate changing size conditions.
*
* Later on we might improve this class to take into account the "preferred" size of
* the widgets.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ void fileOpen() {
OleAutomation player = new OleAutomation(clientSite);
int playURL[] = player.getIDsOfNames(new String[] { "URL" });
if (playURL != null) {
boolean suceeded = player.setProperty(playURL[0], new Variant(fileName));
if (!suceeded)
boolean succeeded = player.setProperty(playURL[0], new Variant(fileName));
if (!succeeded)
disposeClient();
} else {
disposeClient();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class OleWebBrowser {
public static final int FrameBeforeNavigate = 200; // Fired when a new hyperlink is being navigated to in a frame.
public static final int FrameNavigateComplete = 201; // Fired when a new hyperlink is being navigated to in a frame.
public static final int FrameNewWindow = 204; // Fired when a new window should be created.
public static final int Quit = 103; // Fired when application is quiting.
public static final int Quit = 103; // Fired when application is quitting.
public static final int WindowMove = 109; // Fired when window has been moved.
public static final int WindowResize = 110; // Fired when window has been sized.
public static final int WindowActivate = 111; // Fired when window has been activated.
Expand Down Expand Up @@ -217,7 +217,7 @@ public void Refresh(){
}

/**
* Aborts loading of the currnet page.
* Aborts loading of the current page.
*/
public void Stop() {
// dispid=106, type=METHOD, name="Stop"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public void redraw() {
}

/**
* Sets wheter the canvas is double buffered or not.
* Sets whether the canvas is double buffered or not.
*/
public void setDoubleBuffered(boolean doubleBuffered) {
dbItem.setSelection(doubleBuffered);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public class StyledText extends Canvas {
Color foreground = null; //
Clipboard clipboard;
boolean mouseDown = false;
boolean mouseDoubleClick = false; // true=a double click ocurred. Don't do mouse swipe selection.
boolean mouseDoubleClick = false; // true=a double click occurred. Don't do mouse swipe selection.
int autoScrollDirection = SWT.NULL; // the direction of autoscrolling (up, down, right, left)
int autoScrollDistance = 0;
int lastTextChangeStart; // cache data of the
Expand Down Expand Up @@ -857,7 +857,7 @@ public class StyledText extends Canvas {
writeStyledLine(line, lineOffset, styles, lineBackground);
}
/**
* Appends the specified line delmimiter to the RTF data.
* Appends the specified line delimiter to the RTF data.
* <p>
*
* @param lineDelimiter line delimiter to write as RTF.
Expand Down Expand Up @@ -1124,7 +1124,7 @@ public class StyledText extends Canvas {
}
}
/**
* Appends the specified line delmimiter to the data.
* Appends the specified line delimiter to the data.
* <p>
*
* @param lineDelimiter line delimiter to write
Expand Down Expand Up @@ -1290,7 +1290,7 @@ public class StyledText extends Canvas {
return rect.x + rect.width + leftMargin + rightMargin;
}
/**
* Grows the <code>lineWidth</code> array to accomodate new line width
* Grows the <code>lineWidth</code> array to accommodate new line width
* information.
* <p>
*
Expand Down Expand Up @@ -2840,8 +2840,8 @@ void doMouseSelection() {
/**
* Returns the offset of the word at the specified offset.
* If the current selection extends from high index to low index
* (i.e., right to left, or caret is at left border of selecton on
* non-bidi platforms) the start offset of the word preceeding the
* (i.e., right to left, or caret is at left border of selection on
* non-bidi platforms) the start offset of the word preceding the
* selection is returned. If the current selection extends from
* low index to high index the end offset of the word following
* the selection is returned.
Expand Down Expand Up @@ -3810,7 +3810,7 @@ public int getLineHeight() {
/**
* Returns a LineCache implementation. Depending on whether or not
* word wrap is on this may be a line wrapping or line width
* calculating implementaiton.
* calculating implementation.
* <p>
*
* @param content StyledTextContent to create the LineCache on.
Expand Down Expand Up @@ -7764,7 +7764,7 @@ void showCaret(int caretLine) {
* Scrolls the specified offset into view.
* <p>
*
* @param offset offset that should be scolled into view
* @param offset offset that should be scrolled into view
*/
void showOffset(int offset) {
int line = content.getLineAtOffset(offset);
Expand Down Expand Up @@ -7902,7 +7902,7 @@ void wordWrapResize(int oldClientAreaWidth) {
newTopIndex = content.getLineAtOffset(topOffset);
// topOffset is the beginning of the top line. therefore it
// needs to be adjusted because in a wrapped line this is also
// the end of the preceeding line.
// the end of the preceding line.
if (newTopIndex < content.getLineCount() - 1 &&
topOffset == content.getOffsetAtLine(newTopIndex + 1)) {
newTopIndex++;
Expand Down
2 changes: 1 addition & 1 deletion tests/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ tycho.pomless.parent = ../local-build/local-build-parent
pom.model.artifactId = swt-tests

pom.model.property.code.ignoredWarnings = ${tests.ignoredWarnings}
# Skip all tests on build servers, because it contains platform specific code (overriden to false on platform-specific build machines)
# Skip all tests on build servers, because it contains platform specific code (overridden to false on platform-specific build machines)
pom.model.property.skipNativeTests = true
pom.model.property.skipTests = ${skipNativeTests}
Loading