X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42841dfcaddc6045ffc618acbb620b1fde1bc618..6fb603d7458a2df50d11e9afa85d61e3bdb36eb6:/src/msw/listbox.cpp?ds=sidebyside

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 1fc6d08142..7b7fcc8d18 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -513,9 +513,7 @@ wxString wxListBox::GetString(int N) const
 
     // +1 for terminating NUL
     wxString result;
-    wxChar* buffer = result.GetWriteBuf(len + 1);
-    ListBox_GetText(GetHwnd(), N, buffer);
-    result.UngetWriteBuf();
+    ListBox_GetText(GetHwnd(), N, (wxChar*)wxStringBuffer(result, len + 1));
 
     return result;
 }
@@ -618,7 +616,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
         return;
     TEXTMETRIC lpTextMetric;
 
-    if ( !s.IsEmpty() )
+    if ( !s.empty() )
     {
         int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
         HDC dc = GetWindowDC(GetHwnd());