Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-18 11:38:51 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-18 11:38:51 +0400
commit4f19c1a995de507044d1b5ada7fb7398cdb32096 (patch)
treee46c13dd84a493177c80af0715f8f9b09c333943 /source/blender/windowmanager
parente56f71400060f10f73bed6b5c52fc537e5a0d617 (diff)
spelling cleanup
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/WM_types.h4
-rw-r--r--source/blender/windowmanager/intern/wm_files.c4
-rw-r--r--source/blender/windowmanager/intern/wm_jobs.c2
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c10
-rw-r--r--source/blender/windowmanager/intern/wm_window.c4
5 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index c2cb3181e3e..25915444657 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -348,8 +348,8 @@ typedef struct wmEvent {
int mval[2]; /* region mouse position, name convention pre 2.5 :) */
char utf8_buf[6]; /* from, ghost if utf8 is enabled for the platform,
* BLI_str_utf8_size() must _always_ be valid, check
- * when assigning s we dont need to check on every access after */
- char ascii; /* from ghost, fallback if utf8 isnt set */
+ * when assigning s we don't need to check on every access after */
+ char ascii; /* from ghost, fallback if utf8 isn't set */
char pad;
/* previous state */
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 0c2cb7dab3e..1e2c48f4e7f 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -398,7 +398,7 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports)
if (retval != BKE_READ_FILE_FAIL) {
G.relbase_valid = 1;
- if(!G.background) /* assume automated tasks with background, dont write recent file list */
+ if(!G.background) /* assume automated tasks with background, don't write recent file list */
write_history();
}
@@ -748,7 +748,7 @@ int WM_write_file(bContext *C, const char *target, int fileflags, ReportList *re
BLI_strncpy(filepath, target, FILE_MAX);
BLI_replace_extension(filepath, FILE_MAX, ".blend");
- /* dont use 'target' anymore */
+ /* don't use 'target' anymore */
/* send the OnSave event */
for (li= G.main->library.first; li; li= li->id.next) {
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index 5e09a701755..ba2df4e2363 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -258,7 +258,7 @@ static void *do_job_thread(void *job_v)
return NULL;
}
-/* dont allow same startjob to be executed twice */
+/* don't allow same startjob to be executed twice */
static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test)
{
wmJob *steve;
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index f72939c03b2..ba9ff89f175 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -416,7 +416,7 @@ wmOperatorTypeMacro *WM_operatortype_macro_define(wmOperatorType *ot, const char
BLI_addtail(&ot->macro, otmacro);
{
- /* operator should always be found but in the event its not. dont segfault */
+ /* operator should always be found but in the event its not. don't segfault */
wmOperatorType *otsub = WM_operatortype_find(idname, 0);
if(otsub) {
RNA_def_pointer_runtime(ot->srna, otsub->idname, otsub->srna,
@@ -559,7 +559,7 @@ char *WM_operator_pystring(bContext *C, wmOperatorType *ot, PointerRNA *opptr, i
buf_default= RNA_property_as_string(C, &opptr_default, prop_default);
if(strcmp(buf, buf_default)==0)
- ok= 0; /* values match, dont bother printing */
+ ok= 0; /* values match, don't bother printing */
MEM_freeN(buf_default);
}
@@ -773,7 +773,7 @@ static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg_op)
block= uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_RET_1|UI_BLOCK_MOVEMOUSE_QUIT);
- //uiDefBut(block, LABEL, 0, op->type->name, 10, 10, 180, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); // ok, this isnt so easy...
+ //uiDefBut(block, LABEL, 0, op->type->name, 10, 10, 180, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); // ok, this isn't so easy...
but= uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 10, 9*UI_UNIT_X, UI_UNIT_Y, 0, 0, "");
uiButSetSearchFunc(but, operator_enum_search_cb, op->type, operator_enum_call_cb, NULL);
@@ -1250,7 +1250,7 @@ static int wm_resource_check_prev(void)
#if 0 /* ignore the local folder */
if(res == NULL) {
- /* with a local dir, copying old files isnt useful since local dir get priority for config */
+ /* with a local dir, copying old files isn't useful since local dir get priority for config */
res= BLI_get_folder_version(BLENDER_RESOURCE_PATH_LOCAL, BLENDER_VERSION, TRUE);
}
#endif
@@ -2530,7 +2530,7 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, wmEvent *event)
case GESTURE_MODAL_CANCEL:
case GESTURE_MODAL_CONFIRM:
wm_gesture_end(C, op);
- return OPERATOR_FINISHED; /* use finish or we dont get an undo */
+ return OPERATOR_FINISHED; /* use finish or we don't get an undo */
}
}
// // Allow view navigation???
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 4ccebf7a4ff..0782daac03f 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -210,7 +210,7 @@ static int find_free_winid(wmWindowManager *wm)
return id;
}
-/* dont change context itself */
+/* don't change context itself */
wmWindow *wm_window_new(bContext *C)
{
wmWindowManager *wm= CTX_wm_manager(C);
@@ -1126,7 +1126,7 @@ void wm_window_get_size(wmWindow *win, int *width_r, int *height_r)
}
/* exceptional case: - splash is called before events are processed
- * this means we dont actually know the window size so get this from GHOST */
+ * this means we don't actually know the window size so get this from GHOST */
void wm_window_get_size_ghost(wmWindow *win, int *width_r, int *height_r)
{
GHOST_RectangleHandle bounds= GHOST_GetClientBounds(win->ghostwin);