no changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/symbols.txt b/docs/symbols.txt
index 633162fb3024c55386dcbff139f3194572e1301b..d79695390bf17479f396edde633e1f0310aa6462 100644 (file)
--- a/docs/symbols.txt
+++ b/docs/symbols.txt
@@ -20,7 +20,7 @@ __NT__          Windows NT
 __WXCURSES__    CURSES
 __WXSTUBS__     Stubbed version ('template' wxWin implementation)
 
 __WXCURSES__    CURSES
 __WXSTUBS__     Stubbed version ('template' wxWin implementation)
 

-In fact, they should better all start with __WX instead of __ only. 
+In fact, they should better all start with __WX instead of __ only.

 The only GUIs implemented for 2.0 are __WXGTK__, __WXMSW__ and __WXMOTIF__
 yet. Any new ones, please start the define with __WX.
 
 The only GUIs implemented for 2.0 are __WXGTK__, __WXMSW__ and __WXMOTIF__
 yet. Any new ones, please start the define with __WX.
 


@@ -59,6 +59,6 @@ __XLC__         ?? compiler
 wxWindows modes:
 ----------------
 
 wxWindows modes:
 ----------------
 

-__WXDEBUG__       usage: #ifdef __WXDEBUG__ (=> debug mode, else => release)
+__WXDEBUG__     usage: #ifdef __WXDEBUG__ (=> debug mode, else => release)

 WXDEBUG         usage: #if DEBUG (0: release, 1: minimal debug code, ...)
 
 WXDEBUG         usage: #if DEBUG (0: release, 1: minimal debug code, ...)
 

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 10826ae39f05bb90ed5a459f7f416b007511b79d..4f21955870ec637b991b0026a028cd955722c199 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -1990,7 +1990,7 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_
         }
         else
         {
         }
         else
         {

-            lvItem.pszText = WXSTRINGCAST info.m_text;
+            lvItem.pszText = info.m_text;

             if ( lvItem.pszText )
                 lvItem.cchTextMax = info.m_text.Length();
             else
             if ( lvItem.pszText )
                 lvItem.cchTextMax = info.m_text.Length();
             else