Merge pull request #1995 from gorogoro123/feature/remove_UNICODE_ifde…

…f_directive 条件付きコンパイル(UNICODE)削除
sakura-editor · Feb 18, 2025 · d3a55cd · d3a55cd
2 parents e7ae4f1 + 9ca6d88
commit d3a55cd
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/sakura_core/CSelectLang.cpp b/sakura_core/CSelectLang.cpp
@@ -327,11 +327,7 @@ int CLoadString::CLoadStrBuffer::LoadString( UINT uid )
 				m_pszString[0] = L'\0';
 				break;
 			}
-#ifdef UNICODE
 		}else if( nRet >= m_nBufferSize - 1 ){
-#else
-		}else if( nRet >= m_nBufferSize - 2 ){		// ANSI版は1小さい長さで再読み込みを判定する
-#endif
 			// 読みきれなかった場合、バッファを拡張して読み直す
 			int nTemp = m_nBufferSize + LOADSTR_ADD_SIZE;		// 拡張したサイズ
 			LPWSTR pTemp;

diff --git a/sakura_core/recent/CRecentImp.cpp b/sakura_core/recent/CRecentImp.cpp
@@ -570,7 +570,5 @@ template class CRecentImp<CGrepFolderString, LPCWSTR>;
 template class CRecentImp<CSearchString, LPCWSTR>;
 template class CRecentImp<CTagjumpKeywordString, LPCWSTR>;
 template class CRecentImp<CCurDirString, LPCWSTR>;
-#endif
-#if !defined(__MINGW32__) || (defined(__MINGW32__) && !defined(UNICODE))
 template class CRecentImp<CReplaceString, LPCWSTR>;
 #endif
diff --git a/sakura_core/util/file.cpp b/sakura_core/util/file.cpp
@@ -357,14 +357,7 @@ void Concat_FolderAndFile( const WCHAR* pszDir, const WCHAR* pszTitle, WCHAR* ps
 		*out++ = *in++;
 	}
 	//円記号を付加
-#if UNICODE
 	if( *(out-1) != '\\' ){ *out++ = '\\'; }
-#else
-	if( *(out-1) != '\\' ||
-		(1 == out - CNativeW::GetCharPrev( pszDir, out - pszDir, out )) ){
-			*out++ = '\\';
-	}
-#endif
 	//ファイル名をコピー
 	for( in=pszTitle; *in != '\0'; ){
 		*out++ = *in++;