Added drag-shrinking.

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 02ce0c40991738498ce7584f4774d961e3e5309a..7893bd1700e603324514eba2c3da9288b03f1925 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/window.h"
 #include "wx/filefn.h"
 
-#include "wx/ioswrap.h"
-
 #ifdef __X__
     #include <dirent.h>
     #include <unistd.h>
@@ -41,9 +38,10 @@
 
 class WXDLLEXPORT wxProcess;
 class WXDLLEXPORT wxFrame;
+class WXDLLEXPORT wxWindow;
 
 // FIXME should use wxStricmp() instead
-#ifdef __GNUWIN32__
+#if defined(__GNUWIN32__)
     #define stricmp strcasecmp
     #define strnicmp strncasecmp
 #endif
@@ -76,14 +74,19 @@ WXDLLEXPORT bool StringMatch(wxChar *one, wxChar *two, bool subString = TRUE, bo
 // ----------------------------------------------------------------------------
 
 // Sound the bell
-WXDLLEXPORT void wxBell(void) ;
+WXDLLEXPORT void wxBell();
+
+// Get OS description as a user-readable string
+WXDLLEXPORT wxString wxGetOsDescription();
 
 // Get OS version
-WXDLLEXPORT int wxGetOsVersion(int *majorVsn= (int *) NULL,int *minorVsn= (int *) NULL) ;
+WXDLLEXPORT int wxGetOsVersion(int *majorVsn = (int *) NULL,
+                               int *minorVsn = (int *) NULL);
 
 // Return a string with the current date/time
 WXDLLEXPORT wxString wxNow();
 
+#if wxUSE_GUI
 // Don't synthesize KeyUp events holding down a key and producing
 // KeyDown events with autorepeat. On by default and always on
 // in wxMSW.
@@ -108,6 +111,8 @@ WXDLLEXPORT void wxRegisterId(long id);
 // Return the current ID
 WXDLLEXPORT long wxGetCurrentId();
 
+#endif // wxUSE_GUI
+
 // ----------------------------------------------------------------------------
 // Various conversions
 // ----------------------------------------------------------------------------
@@ -171,7 +176,7 @@ WXDLLEXPORT int wxKill(long pid, wxSignal sig = wxSIGTERM);
 // If no command then just the shell
 WXDLLEXPORT bool wxShell(const wxString& command = wxEmptyString);
 
-// Sleep for nSecs seconds under UNIX, do nothing under Windows
+// Sleep for nSecs seconds
 WXDLLEXPORT void wxSleep(int nSecs);
 
 // Sleep for a given amount of milliseconds
@@ -196,6 +201,7 @@ WXDLLEXPORT wxString wxGetHostName();
 
 // 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);
@@ -206,6 +212,7 @@ WXDLLEXPORT bool wxGetUserName(wxChar *buf, int maxSize);
 WXDLLEXPORT wxString wxGetUserName();
 
 // Get current Home dir and copy to dest (returns pstr->c_str())
+WXDLLEXPORT wxString wxGetHomeDir();
 WXDLLEXPORT const wxChar* wxGetHomeDir(wxString *pstr);
 
 // Get the user's home dir (caller must copy --- volatile)
@@ -216,13 +223,20 @@ WXDLLEXPORT const wxMB2WXbuf wxGetUserHome(const wxString& user = wxEmptyString)
 WXDLLEXPORT wxChar* wxGetUserHome(const wxString& user = wxEmptyString);
 #endif
 
+#if wxUSE_GUI // GUI only things from now on
+
 // ----------------------------------------------------------------------------
-// Strip out any menu codes
+// Menu accelerators related things
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT wxChar* wxStripMenuCodes(wxChar *in, wxChar *out = (wxChar *) NULL);
 WXDLLEXPORT wxString wxStripMenuCodes(const wxString& str);
 
+#if wxUSE_ACCEL
+class WXDLLEXPORT wxAcceleratorEntry;
+WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label);
+#endif // wxUSE_ACCEL
+
 // ----------------------------------------------------------------------------
 // Window search
 // ----------------------------------------------------------------------------
@@ -289,7 +303,7 @@ public:
 
 // Format a message on the standard error (UNIX) or the debugging
 // stream (Windows)
-WXDLLEXPORT void wxDebugMsg(const wxChar *fmt ...) ;
+WXDLLEXPORT void wxDebugMsg(const wxChar *fmt ...);
 
 // Non-fatal error (continues)
 WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr;
@@ -333,15 +347,26 @@ WXDLLEXPORT void wxRedirectIOToConsole();
 // Display and colorss (X only)
 // ----------------------------------------------------------------------------
 
+#ifdef __WXGTK__
+    void *wxGetDisplay();
+#endif
+
 #ifdef __X__
     WXDisplay *wxGetDisplay();
     bool wxSetDisplay(const wxString& display_name);
     wxString wxGetDisplayName();
-#endif
+#endif // X or GTK+
 
 #ifdef __X__
 
+#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
+               // The resulting warnings are switched off here
+#pragma message disable nosimpint
+#endif
 #include <X11/Xlib.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #define wxMAX_RGB           0xff
 #define wxMAX_SV            1000
@@ -364,5 +389,7 @@ void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
 
 #endif //__X__
 
+#endif // wxUSE_GUI
+
 #endif
     // _WX_UTILSH__