diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 1e0347a922..801d7b0bbc 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -328,9 +328,9 @@ STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_ CAPTION "ファイルのプロパティ" FONT 9, "MS Pゴシック" BEGIN - EDITTEXT IDC_EDIT_PROPERTY, 5, 5, 260, 200, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP DEFPUSHBUTTON "閉じる(&C)", IDOK, 155, 208, 50, 14 PUSHBUTTON "ヘルプ(&H)", IDC_BUTTON_HELP, 215, 208, 50, 14 + EDITTEXT IDC_EDIT_PROPERTY, 5, 5, 260, 200, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_TABSTOP END IDD_INPUT1 DIALOGEX 0, 0, 185, 55 diff --git a/sakura_core/util/design_template.h b/sakura_core/util/design_template.h index 3f90dc7574..9a9e98dafa 100644 --- a/sakura_core/util/design_template.h +++ b/sakura_core/util/design_template.h @@ -36,7 +36,7 @@ #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ TypeName(const TypeName&) = delete; \ TypeName& operator=(const TypeName&) = delete; \ - TypeName(TypeName&&) = delete; \ + TypeName(TypeName&&) = delete; \ TypeName& operator=(TypeName&&) = delete; /*! diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index bc87d096c1..46f8d2d340 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -333,9 +333,9 @@ STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_ CAPTION "File Property" FONT 9, "Tahoma" BEGIN - EDITTEXT IDC_EDIT_PROPERTY, 5, 5, 260, 200, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP DEFPUSHBUTTON "&Close", IDOK, 155, 208, 50, 14 PUSHBUTTON "&Help", IDC_BUTTON_HELP, 215, 208, 50, 14 + EDITTEXT IDC_EDIT_PROPERTY, 5, 5, 260, 200, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_TABSTOP END IDD_INPUT1 DIALOGEX 0, 0, 185, 55