Skip to content

Commit 7ceae0b

Browse files
committed
Replicate in Generals
1 parent 6792e01 commit 7ceae0b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Generals/Code/GameEngine/Include/GameClient/IMEManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class IMEManagerInterface : public SubsystemInterface
8888

8989

9090
virtual Int getCandidateCount() = 0; ///< Returns the total number of candidates
91-
virtual UnicodeString*getCandidate( Int index ) = 0; ///< Returns the candidate string
91+
virtual const UnicodeString* getCandidate( Int index ) = 0; ///< Returns the candidate string
9292
virtual Int getSelectedCandidateIndex() = 0; ///< Returns the indexed of the currently selected candidate
9393
virtual Int getCandidatePageSize() = 0; ///< Returns the page size for the candidates list
9494
virtual Int getCandidatePageStart() = 0; ///< Returns the index of the first visibel candidate

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void IMECandidateTextAreaDraw( GameWindow *window, WinInstanceData *instData )
202202

203203
for ( Int i = 0; i < count; i++, y+= height )
204204
{
205-
UnicodeString *candidate = ime->getCandidate( first + i );
205+
const UnicodeString *candidate = ime->getCandidate( first + i );
206206
Int tcolor, bcolor;
207207

208208
if ( i == selected )

Generals/Code/GameEngine/Source/GameClient/GUI/IMEManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class IMEManager : public IMEManagerInterface
109109
virtual Int getIndexBase( void ); ///< Get index base for candidate list
110110

111111
virtual Int getCandidateCount(); ///< Returns the total number of candidates
112-
virtual UnicodeString*getCandidate( Int index ); ///< Returns the candidate string
112+
virtual const UnicodeString* getCandidate( Int index ); ///< Returns the candidate string
113113
virtual Int getSelectedCandidateIndex(); ///< Returns the indexed of the currently selected candidate
114114
virtual Int getCandidatePageSize(); ///< Returns the page size for the candidates list
115115
virtual Int getCandidatePageStart(); ///< Returns the index of the first visibel candidate
@@ -1528,7 +1528,7 @@ Int IMEManager::getCandidateCount()
15281528
// IMEManager::getCandidate
15291529
//============================================================================
15301530

1531-
UnicodeString* IMEManager::getCandidate( Int index )
1531+
const UnicodeString* IMEManager::getCandidate( Int index )
15321532
{
15331533
if ( m_candidateString != NULL && index >=0 && index < m_candidateCount )
15341534
{

0 commit comments

Comments
 (0)