diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 16:22:13 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 16:22:13 +0000 |
| commit | d5d023f683b23fe26ddea93738cb721d532804f0 (patch) | |
| tree | 21e7398686c7a5d1604d58bfb71ca4329c84be66 /protocols/IRCG/options.cpp | |
| parent | e58823d961a630eb62e60d2ccb443761ba5f1704 (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IRCG/options.cpp')
| -rw-r--r-- | protocols/IRCG/options.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/protocols/IRCG/options.cpp b/protocols/IRCG/options.cpp index 76f6a97afe..25cf9d38b1 100644 --- a/protocols/IRCG/options.cpp +++ b/protocols/IRCG/options.cpp @@ -66,7 +66,6 @@ void CIrcProto::ReadSettings( TDbSetting* sets, int count ) *( char** )ptr = NULL;
}
break;
- #if defined( _UNICODE )
case DBVT_TCHAR:
if ( !getTString( p->name, &dbv )) {
if ( p->size != -1 ) {
@@ -87,7 +86,6 @@ void CIrcProto::ReadSettings( TDbSetting* sets, int count ) else *( TCHAR** )ptr = mir_tstrdup( p->defStr );
}
break;
- #endif
} } }
void CIrcProto::WriteSettings( TDbSetting* sets, int count )
@@ -109,14 +107,12 @@ void CIrcProto::WriteSettings( TDbSetting* sets, int count ) setString( p->name, (char*)ptr );
break;
- #if defined( _UNICODE )
case DBVT_TCHAR:
if ( p->size == -1 )
setTString( p->name, *(TCHAR**)ptr );
else
setTString( p->name, (TCHAR*)ptr );
break;
- #endif
} } }
/////////////////////////////////////////////////////////////////////////////////////////
@@ -1098,12 +1094,8 @@ void COtherPrefsDlg::OnInitDialog() m_add.Enable( m_proto->m_perform );
m_delete.Enable( m_proto->m_perform );
- #if defined( _UNICODE )
- fnGetCPInfoEx = ( pfnGetCPInfoEx )GetProcAddress( GetModuleHandleA( "kernel32.dll" ), "GetCPInfoExW" );
- #else
- fnGetCPInfoEx = ( pfnGetCPInfoEx )GetProcAddress( GetModuleHandleA( "kernel32.dll" ), "GetCPInfoExA" );
- #endif
-
+ fnGetCPInfoEx = ( pfnGetCPInfoEx )GetProcAddress( GetModuleHandleA( "kernel32.dll" ), "GetCPInfoExW" );
+
m_codepage.AddString( TranslateT("Default ANSI codepage"), CP_ACP );
if ( fnGetCPInfoEx == NULL )
m_codepage.AddString( TranslateT("UTF-8"), CP_UTF8 );
@@ -1118,10 +1110,7 @@ void COtherPrefsDlg::OnInitDialog() break;
} }
- #if !defined( _UNICODE )
- m_codepage.Enable( FALSE );
- #endif
-
+
if ( m_proto->m_codepage == CP_UTF8 )
m_autodetect.Disable();
|