compilation fixes for wxUniv (moved wxDlgProc back to toplevel.cpp)

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 707c1d4664cb6da77bd7367b5814f1e6888ce172..d9fcbb003362932d1630571c460d22d9a7329d53 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -38,19 +38,14 @@
 #endif
 #endif  //WX_PRECOMP
 
 #endif
 #endif  //WX_PRECOMP
 

-// In some mingws there is a missing extern "C" int the winsock header,
-// so we put it here just to be safe. Note that this must appear _before_
-// #include "wx/msw/private.h" which itself includes <windows.h>, as this
-// one in turn includes <winsock.h> unless we define WIN32_LEAN_AND_MEAN.
-//
-#if defined(__WIN32__) && !defined(__TWIN32__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
-extern "C" {
-    #include <winsock.h>    // we use socket functions in wxGetFullHostName()
-}
-#endif
-

 #include "wx/msw/private.h"     // includes <windows.h>
 
 #include "wx/msw/private.h"     // includes <windows.h>
 

+#ifdef __GNUWIN32_OLD__
+    // apparently we need to include winsock.h to get WSADATA and other stuff
+    // used in wxGetFullHostName() with the old mingw32 versions
+    #include <winsock.h>
+#endif
+

 #include "wx/timer.h"
 
 #if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__)
 #include "wx/timer.h"
 
 #if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__)


@@ -199,7 +194,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
                 if ( pHostEnt )
                 {
                     // Windows will use DNS internally now
                 if ( pHostEnt )
                 {
                     // Windows will use DNS internally now

-                    pHostEnt = gethostbyaddr(pHostEnt->h_addr, 4, PF_INET);
+                    pHostEnt = gethostbyaddr(pHostEnt->h_addr, 4, AF_INET);

                 }
 
                 if ( pHostEnt )
                 }
 
                 if ( pHostEnt )


@@ -952,6 +947,15 @@ long wxGetFreeMemory()
 #endif
 }
 
 #endif
 }
 

+unsigned long wxGetProcessId()
+{
+#ifdef __WIN32__
+    return ::GetCurrentProcessId();
+#else
+    return 0;
+#endif
+}
+

 // Emit a beeeeeep
 void wxBell()
 {
 // Emit a beeeeeep
 void wxBell()
 {