X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63cc5d9d20f997961881855811f6b6987679969d..bae41ce1922f02b8af69b4fffbf3b6a2183f9ba7:/src/common/utilscmn.cpp?ds=inline

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 9f91d813c8..4b6e87cbce 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -30,14 +30,6 @@
 #include "wx/textdlg.h"
 #endif
 
-#include "wx/ioswrap.h"
-
-#if wxUSE_IOSTREAMH
-    #include <fstream.h>
-#else
-    #include <fstream>
-#endif
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -168,6 +160,12 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 #endif
 
 #else
+
+#ifdef __EMX__
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
+#endif
+
 // This declaration is missing in SunOS!
 // (Yes, I know it is NOT ANSI-C but its in BSD libc)
 #if defined(__xlC) || defined(__AIX__) || defined(__GNUG__)
@@ -792,6 +790,7 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
     return ans;
 }
 
+#if wxUSE_TEXTDLG
 wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
                         const wxString& defaultValue, wxWindow *parent,
                         int x, int y, bool WXUNUSED(centre) )
@@ -802,6 +801,7 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
     else
         return wxString("");
 }
+#endif // wxUSE_TEXTDLG
 
 #ifdef __MWERKS__
 char *strdup(const char *s)
@@ -893,3 +893,18 @@ wxString wxGetHostName()
     return buf;
 }
 
+wxString wxGetFullHostName()
+{
+    static const size_t hostnameSize = 257;
+
+    wxString buf;
+    bool ok = wxGetFullHostName(buf.GetWriteBuf(hostnameSize), hostnameSize);
+
+    buf.UngetWriteBuf();
+
+    if ( !ok )
+        buf.Empty();
+
+    return buf;
+}
+