wxGetFullHostName() implemented - it doesn't work though (and won't even

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 52a8f79891d1ae004e3db8d1f99d54cc94fa1000..c9c1d5b68a25991c22dbae05d7d7735386f18994 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -35,7 +35,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
+#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__)

 #include <direct.h>
 
 #ifndef __MWERKS__
 #include <direct.h>
 
 #ifndef __MWERKS__


@@ -56,7 +56,7 @@
 #include <dir.h>
 #endif
 
 #include <dir.h>
 #endif
 

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXWINE__)

 #include <io.h>
 
 #ifndef __GNUWIN32__
 #include <io.h>
 
 #ifndef __GNUWIN32__


@@ -534,11 +534,11 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
 #endif // wxUSE_RESOURCES
 
 // ---------------------------------------------------------------------------
 #endif // wxUSE_RESOURCES
 
 // ---------------------------------------------------------------------------

-// helper functiosn for showing a "busy" cursor
+// helper functions for showing a "busy" cursor

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-extern HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
-static HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
+HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
+HCURSOR gs_wxBusyCursorOld = 0;  // old cursor

 static int gs_wxBusyCursorCount = 0;
 
 // Set the cursor to the busy cursor for all windows
 static int gs_wxBusyCursorCount = 0;
 
 // Set the cursor to the busy cursor for all windows