X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2461cfa0d9b786a26a783237bca38c920efecb51..ad4e3f7be6f20d5a164a608b44c51056231ddad9:/src/os2/utilsgui.cpp

diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp
index a48d2a0936..5b7e06cf34 100644
--- a/src/os2/utilsgui.cpp
+++ b/src/os2/utilsgui.cpp
@@ -428,8 +428,10 @@ void wxDisplaySize(
         ::DevCloseDC(hdcScreen);
         ::WinReleasePS(hpsScreen);
     }
-    *pWidth = (int)lWidth;
-    *pHeight = (int)lHeight;
+    if (pWidth)
+        *pWidth = (int)lWidth;
+    if (pHeight)
+        *pHeight = (int)lHeight;
 }
 
 void wxDisplaySizeMM(
@@ -519,7 +521,7 @@ wxString WXDLLEXPORT wxGetWindowText(
     if ( hWnd )
     {
 	long                lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1;
-	::WinQueryWindowText((HWND)hWnd, lLen, wxStringBuffer(vStr, lLen));
+	::WinQueryWindowText((HWND)hWnd, lLen, (PSZ)(wxChar*)wxStringBuffer(vStr, lLen));
     }
 
     return vStr;
@@ -536,7 +538,7 @@ wxString WXDLLEXPORT wxGetWindowClass(
 
 	for ( ;; )
 	{
-	    int                     nCount = ::WinQueryClassName((HWND)hWnd, nLen, wxStringBuffer(vStr, nLen));
+	    int                     nCount = ::WinQueryClassName((HWND)hWnd, nLen, (PSZ)(wxChar*)wxStringBuffer(vStr, nLen));
 
 	    if (nCount == nLen )
 	    {
@@ -939,7 +941,7 @@ wxBitmap wxDisableBitmap(
     int                             j;
 
     //
-    // Bitmap must be ina double-word alligned address so we may
+    // Bitmap must be in a double-word aligned address so we may
     // have some padding to worry about
     //
     if (nLineBoundary > 0)