Test the commit announcement bot some more by fixing more gtk signal callback handler...

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

diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp
index 46712f85f1bb88c5005c04ddb28066a7953a4bec..66647fcd2eb98f964091067fb522d937c66b49ae 100644 (file)
--- a/src/os2/utilsgui.cpp
+++ b/src/os2/utilsgui.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        os2/utilsgui.cpp
+// Name:        src/os2/utilsgui.cpp
 // Purpose:     Various utility functions only available in GUI
 // Author:      David Webster
 // Modified by:
@@ -25,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/setup.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/cursor.h"
@@ -69,7 +68,7 @@ bool wxWriteResource(
     HAB                             hab = 0;
     HINI                            hIni = 0;
 
-    if (rFile != "")
+    if (!rFile.empty())
     {
         hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile);
         if (hIni != 0L)
@@ -153,7 +152,7 @@ bool wxGetResource(
     wxChar                          zDefunkt[] = _T("$$default");
     char                            zBuf[1000];
 
-    if (rFile != "")
+    if (!rFile.empty())
     {
         hIni = ::PrfOpenProfile(hab, (PSZ)WXSTRINGCAST rFile);
         if (hIni != 0L)
@@ -428,8 +427,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(
@@ -482,7 +483,7 @@ void wxGUIAppTraits::TerminateGui(unsigned long ulHab)
 
 wxToolkitInfo & wxGUIAppTraits::GetToolkitInfo()
 {
-    static wxToolkitInfo           vInfo;
+    static wxToolkitInfo vInfo;
     ULONG                           ulSysInfo[QSV_MAX] = {0};
     APIRET                          ulrc;
 
@@ -510,44 +511,40 @@ wxToolkitInfo & wxGUIAppTraits::GetToolkitInfo()
 // window information functions
 // ---------------------------------------------------------------------------
 
-wxString WXDLLEXPORT wxGetWindowText(
-  WXHWND                            hWnd
-)
+wxString WXDLLEXPORT wxGetWindowText( WXHWND hWnd )
 {
-    wxString                        vStr;
+    wxString vStr;
 
     if ( hWnd )
     {
-       long                lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1;
-       ::WinQueryWindowText((HWND)hWnd, lLen, (PSZ)(wxChar*)wxStringBuffer(vStr, lLen));
+        long lLen = ::WinQueryWindowTextLength((HWND)hWnd) + 1;
+        ::WinQueryWindowText((HWND)hWnd, lLen, (PSZ)(wxChar*)wxStringBuffer(vStr, lLen));
     }
 
     return vStr;
 }
 
-wxString WXDLLEXPORT wxGetWindowClass(
-  WXHWND                            hWnd
-)
+wxString WXDLLEXPORT wxGetWindowClass( WXHWND hWnd )
 {
-    wxString                        vStr;
+    wxString vStr;
     if ( hWnd )
     {
-        int                         nLen = 256; // some starting value
-
-       for ( ;; )
-       {
-           int                     nCount = ::WinQueryClassName((HWND)hWnd, nLen, (PSZ)(wxChar*)wxStringBuffer(vStr, nLen));
-
-           if (nCount == nLen )
-           {
-               // the class name might have been truncated, retry with larger
-               // buffer
-               nLen *= 2;
-           }
-           else
-           {
-               break;
-           }
+        int nLen = 256; // some starting value
+
+    for ( ;; )
+    {
+        int                     nCount = ::WinQueryClassName((HWND)hWnd, nLen, (PSZ)(wxChar*)wxStringBuffer(vStr, nLen));
+
+        if (nCount == nLen )
+        {
+            // the class name might have been truncated, retry with larger
+            // buffer
+            nLen *= 2;
+        }
+        else
+        {
+            break;
+        }
         }
     }
     return vStr;