Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first phase of transition to unified Unicode build:

Browse Source 
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*)
2. added template type-safe wrappers for vararg functions
3. added wxUniChar class representing single Unicode character
4. changed wxString::operator[] and wxString::iterator to return wxUniChar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-03-17 10:26:10 +00:00
parent cd632a8617
commit c9f7896861
80 changed files with 2229 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/unix/dlunix.cpp
View File

@@ -271,14 +271,12 @@ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
/* static */
void wxDynamicLibrary::Error()
{
#if wxUSE_UNICODE
wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
const wxChar *err = buffer;
#else
const wxChar *err = dlerror();
#endif
wxString err(dlerror());
wxLogError(wxT("%s"), err ? err : _("Unknown dynamic library error"));
if ( err.empty() )
err = _("Unknown dynamic library error");
wxLogError(wxT("%s"), err);
}
#endif // wxHAVE_DYNLIB_ERROR

4
src/unix/joystick.cpp
View File

@@ -394,7 +394,7 @@ int wxJoystick::GetNumberButtons() const
if (m_device != -1)
ioctl(m_device, JSIOCGBUTTONS, &nb);
if (nb > wxJS_MAX_BUTTONS)
if ((int)nb > wxJS_MAX_BUTTONS)
nb = wxJS_MAX_BUTTONS;
return nb;
@@ -407,7 +407,7 @@ int wxJoystick::GetNumberAxes() const
if (m_device != -1)
ioctl(m_device, JSIOCGAXES, &nb);
if (nb > wxJS_MAX_AXES)
if ((int)nb > wxJS_MAX_AXES)
nb = wxJS_MAX_AXES;
return nb;