Some minor corrections (typos, return value handling).

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index c9705d8ea44c97e3d0214a57b4c4d3df5b66b5fc..5b76f3ca10ab01e296234eaa4305370c72566244 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -266,7 +266,7 @@ bool wxDialog::Show( bool bShow )
     if ( bShow )
     {
         // dialogs don't get WM_SIZE message after creation unlike most (all?)
-        // other windows and so could start their life non laid out correctly
+        // other windows and so could start their life not laid out correctly
         // if we didn't call Layout() from here
         //
         // NB: normally we should call it just the first time but doing it

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index 20d589fe72f715bc8d4572ea8a9d78944c0f19e6..57f0e770c24a081ab4181a40bfc9b3740426d9c1 100644 (file)
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -812,8 +812,10 @@ void wxSlider::GetPosition(
         vPoint.x -= vPt.x;
         vPoint.y -= vPt.y;
     }
-    *pnX = vPoint.x;
-    *pnY = vPoint.y;
+    if (pnX)
+        *pnX = vPoint.x;
+    if (pnY)
+        *pnY = vPoint.y;
 } // end of wxSlider::GetPosition
 
 int wxSlider::GetSelEnd() const

diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp
index 9b9ca7ada70cda3fa0a0b0f97d5af820cacb6ae7..a7da77ea4ea0d72c8bd6eb3f191bee6bc6364015 100644 (file)
--- a/src/os2/spinctrl.cpp
+++ b/src/os2/spinctrl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/spinctrl.cpp
-// Purpose:     wxSpinCtrl class implementation for Win32
+// Name:        os2/spinctrl.cpp
+// Purpose:     wxSpinCtrl class implementation for OS/2
 // Author:      David Webster
 // Modified by:
 // Created:     10/15/99

diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp
index 46712f85f1bb88c5005c04ddb28066a7953a4bec..5b7e06cf347edf692d6ecf98c3bfc50a6cfdfd49 100644 (file)
--- 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(