fix for opening files with VC++ 8 (closes bug 994337)

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

diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index 418aef7964fb3898296d042f704d954be7e8d131..ebcb3ef13816b24d8e63d9ac2a806ad288e07dda 100644 (file)
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -6,7 +6,7 @@
 // Created:     21.06.2003 (extracted from msw/utils.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     21.06.2003 (extracted from msw/utils.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -334,7 +334,7 @@ void wxDisplaySizeMM(int *width, int *height)
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {

-#if defined(__WIN16__) || defined(__WXMICROWIN__)
+#if defined(__WXMICROWIN__)

     *x = 0; *y = 0;
     wxDisplaySize(width, height);
 #else
     *x = 0; *y = 0;
     wxDisplaySize(width, height);
 #else


@@ -400,11 +400,7 @@ wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd)
 
 WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
 {
 
 WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
 {

-#ifndef __WIN32__
-    return (WXWORD)GetWindowWord((HWND)hWnd, GWW_ID);
-#else // Win32

     return (WXWORD)GetWindowLong((HWND)hWnd, GWL_ID);
     return (WXWORD)GetWindowLong((HWND)hWnd, GWL_ID);

-#endif // Win16/32

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------