fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 70909...

[wxWidgets.git] / src / msw / utilsgui.cpp

diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index 9b14ea38ac413831d2b49a05e37cb75594280e83..418aef7964fb3898296d042f704d954be7e8d131 100644 (file)
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -99,7 +99,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, wxChar **valu
             return FALSE;
     }
     if (*value) delete[] (*value);
             return FALSE;
     }
     if (*value) delete[] (*value);

-    *value = copystring(buf);
+    *value = wxStrcpy(new wxChar[wxStrlen(buf) + 1], buf);

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -361,8 +361,7 @@ wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd)
     if ( hWnd )
     {
         int len = GetWindowTextLength((HWND)hWnd) + 1;
     if ( hWnd )
     {
         int len = GetWindowTextLength((HWND)hWnd) + 1;

-        ::GetWindowText((HWND)hWnd, str.GetWriteBuf(len), len);
-        str.UngetWriteBuf();
+        ::GetWindowText((HWND)hWnd, wxStringBuffer(str, len), len);

     }
 
     return str;
     }
 
     return str;


@@ -380,9 +379,8 @@ wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd)
 
         for ( ;; )
         {
 
         for ( ;; )
         {

-            int count = ::GetClassName((HWND)hWnd, str.GetWriteBuf(len), len);
+            int count = ::GetClassName((HWND)hWnd, wxStringBuffer(str, len), len);

 
 

-            str.UngetWriteBuf();

             if ( count == len )
             {
                 // the class name might have been truncated, retry with larger
             if ( count == len )
             {
                 // the class name might have been truncated, retry with larger