Fix for crash when opening empty node

[wxWidgets.git] / src / os2 / listbox.cpp

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 11e6a92bc7e354fccb46be6f2e98eb3d71b95a13..aaca7eabcb76c03ff319862a77a5cb33a47f1d34 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -26,9 +26,9 @@
     #include "wx/utils.h"
     #include "wx/scrolwin.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/scrolwin.h"
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/os2/private.h"
 
 #define INCL_M
 #include "wx/os2/private.h"
 
 #define INCL_M


@@ -281,7 +281,7 @@ int wxListBox::DoAppend(const wxString& rsItem)
     else
         lIndexType = LIT_END;
 
     else
         lIndexType = LIT_END;
 

-    lIndex = (long)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)rsItem.c_str());
+    lIndex = (long)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)rsItem.wx_str());

     m_nNumItems++;
 
 #if wxUSE_OWNER_DRAWN
     m_nNumItems++;
 
 #if wxUSE_OWNER_DRAWN


@@ -318,7 +318,7 @@ void wxListBox::DoSetItems( const wxArrayString& raChoices,
             lIndexType = LIT_SORTASCENDING;
         else
             lIndexType = LIT_END;
             lIndexType = LIT_SORTASCENDING;
         else
             lIndexType = LIT_END;

-        ::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)raChoices[i].c_str());
+        ::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)raChoices[i].wx_str());

 
         if (ppClientData)
         {
 
         if (ppClientData)
         {


@@ -563,7 +563,7 @@ void wxListBox::DoInsertItems(const wxArrayString& asItems, unsigned int nPos)
         int nIndex = (int)::WinSendMsg( GetHwnd(),
                                         LM_INSERTITEM,
                                         MPFROMLONG((LONG)(i + nPos)),
         int nIndex = (int)::WinSendMsg( GetHwnd(),
                                         LM_INSERTITEM,
                                         MPFROMLONG((LONG)(i + nPos)),

-                                        (MPARAM)asItems[i].c_str() );
+                                        (MPARAM)asItems[i].wx_str() );

 
         wxOwnerDrawn* pNewItem = CreateItem(nIndex);
 
 
         wxOwnerDrawn* pNewItem = CreateItem(nIndex);
 


@@ -613,7 +613,7 @@ void wxListBox::SetString(unsigned int n, const wxString& rsString)
     ::WinSendMsg( GetHwnd()
                  ,LM_INSERTITEM
                  ,(MPARAM)nNewN
     ::WinSendMsg( GetHwnd()
                  ,LM_INSERTITEM
                  ,(MPARAM)nNewN

-                 ,(MPARAM)rsString.c_str()
+                 ,(MPARAM)rsString.wx_str()

                 );
 
     //
                 );
 
     //