Revision: 2758
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2758&view=rev
Author: ulteq
Date: 2012-05-30 17:51:05 +0000 (Wed, 30 May 2012)
Log Message:
-----------
fixes error: call of overloaded ?\226?\128?\152wxString(char*&)?\226?\128?\153
is ambiguous
Modified Paths:
--------------
trunk/source/configurator/Configurator.cpp
Modified: trunk/source/configurator/Configurator.cpp
===================================================================
--- trunk/source/configurator/Configurator.cpp 2012-05-30 17:25:26 UTC (rev
2757)
+++ trunk/source/configurator/Configurator.cpp 2012-05-30 17:51:05 UTC (rev
2758)
@@ -1470,8 +1470,8 @@
// missing header fr this:
//ALCdevice *device = alcOpenDevice(devices);
//wxLogStatus(wxString(device->szDeviceName));
- sound->AppendValueItem(wxString(devices));
- wxLogStatus(wxT(" *") + wxString(devices));
+ sound->AppendValueItem(wxString(conv(devices)));
+ wxLogStatus(wxT(" *") + wxString(conv(devices)));
devices += strlen(devices) + 1; //next device
}
y+=35;
@@ -1479,7 +1479,7 @@
wxLogStatus(wxT("Sound Extensions: "));
char *extensions = (char *)alcGetString(NULL, ALC_ENUMERATE_ALL_EXT);
- wxStringTokenizer tkz(wxString(extensions), wxT(" "));
+ wxStringTokenizer tkz(wxString(conv(extensions)), wxT(" "));
while ( tkz.HasMoreTokens() )
{
wxString token = tkz.GetNextToken();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
