fixed compilation and added support for all 4 images (as a side effect) to the

[wxWidgets.git] / include / wx / utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 02ce0c40991738498ce7584f4774d961e3e5309a..368b6409bc11ba4384dd578fd770e31198039919 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -23,11 +23,8 @@
 #include "wx/setup.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/setup.h"
 #include "wx/object.h"
 #include "wx/list.h"

-#include "wx/window.h"

 #include "wx/filefn.h"
 
 #include "wx/filefn.h"
 

-#include "wx/ioswrap.h"
-

 #ifdef __X__
     #include <dirent.h>
     #include <unistd.h>
 #ifdef __X__
     #include <dirent.h>
     #include <unistd.h>


@@ -41,9 +38,10 @@
 
 class WXDLLEXPORT wxProcess;
 class WXDLLEXPORT wxFrame;
 
 class WXDLLEXPORT wxProcess;
 class WXDLLEXPORT wxFrame;

+class WXDLLEXPORT wxWindow;

 
 // FIXME should use wxStricmp() instead
 
 // FIXME should use wxStricmp() instead

-#ifdef __GNUWIN32__
+#if defined(__GNUWIN32__)

     #define stricmp strcasecmp
     #define strnicmp strncasecmp
 #endif
     #define stricmp strcasecmp
     #define strnicmp strncasecmp
 #endif


@@ -196,6 +194,7 @@ WXDLLEXPORT wxString wxGetHostName();
 
 // Get FQDN
 WXDLLEXPORT wxString wxGetFullHostName();
 
 // Get FQDN
 WXDLLEXPORT wxString wxGetFullHostName();

+WXDLLEXPORT bool wxGetFullHostName(wxChar *buf, int maxSize);

 
 // Get user ID e.g. jacs (this is known as login name under Unix)
 WXDLLEXPORT bool wxGetUserId(wxChar *buf, int maxSize);
 
 // Get user ID e.g. jacs (this is known as login name under Unix)
 WXDLLEXPORT bool wxGetUserId(wxChar *buf, int maxSize);