From 42782237f24807ddb0bae1c84997e29573f5c2df Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Mon, 2 Jan 2006 16:17:43 +0000 Subject: [PATCH] Some minor corrections (typos, return value handling). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/dialog.cpp | 2 +- src/os2/slider.cpp | 6 ++++-- src/os2/spinctrl.cpp | 4 ++-- src/os2/utilsgui.cpp | 6 ++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index c9705d8ea4..5b76f3ca10 100644 --- 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 20d589fe72..57f0e770c2 100644 --- 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 9b9ca7ada7..a7da77ea4e 100644 --- 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 46712f85f1..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( -- 2.45.2