X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0492f7d97d77ec085e58d3f4a66c86508bc5f31..3d0c4d2e7bcedb4599c3cce0af19adf73b2f8ecd:/include/wx/utils.h diff --git a/include/wx/utils.h b/include/wx/utils.h index db163acb3e..491dda2549 100644 --- 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 #include @@ -41,9 +38,11 @@ class WXDLLEXPORT wxProcess; class WXDLLEXPORT wxFrame; +class WXDLLEXPORT wxWindow; +class WXDLLEXPORT wxWindowList; // FIXME should use wxStricmp() instead -#ifdef __GNUWIN32__ +#if defined(__GNUWIN32__) #define stricmp strcasecmp #define strnicmp strncasecmp #endif @@ -76,17 +75,22 @@ 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(); -// Synthesize KeyUp events holding down a key and producing -// KeyDown events with autorepeat. On by default an always -// on in wxMSW. +#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. WXDLLEXPORT bool wxSetDetectableAutoRepeat( bool flag ); // ---------------------------------------------------------------------------- @@ -108,6 +112,8 @@ WXDLLEXPORT void wxRegisterId(long id); // Return the current ID WXDLLEXPORT long wxGetCurrentId(); +#endif // wxUSE_GUI + // ---------------------------------------------------------------------------- // Various conversions // ---------------------------------------------------------------------------- @@ -141,6 +147,15 @@ WXDLLEXPORT long wxExecute(wxChar **argv, bool sync = FALSE, WXDLLEXPORT long wxExecute(const wxString& command, bool sync = FALSE, wxProcess *process = (wxProcess *) NULL); +// execute the command capturing its output into an array line by line +WXDLLEXPORT long wxExecute(const wxString& command, + wxArrayString& output); + +// also capture stderr +WXDLLEXPORT long wxExecute(const wxString& command, + wxArrayString& output, + wxArrayString& error); + enum wxSignal { wxSIGNONE = 0, // verify if the process exists under Unix @@ -167,11 +182,15 @@ enum wxSignal // the argument is ignored under Windows - the process is always killed WXDLLEXPORT int wxKill(long pid, wxSignal sig = wxSIGTERM); -// Execute a command in an interactive shell window +// Execute a command in an interactive shell window (always synchronously) // If no command then just the shell WXDLLEXPORT bool wxShell(const wxString& command = wxEmptyString); -// Sleep for nSecs seconds under UNIX, do nothing under Windows +// As wxShell(), but must give a (non interactive) command and its output will +// be returned in output array +WXDLLEXPORT bool wxShell(const wxString& command, wxArrayString& output); + +// Sleep for nSecs seconds WXDLLEXPORT void wxSleep(int nSecs); // Sleep for a given amount of milliseconds @@ -180,6 +199,9 @@ WXDLLEXPORT void wxUsleep(unsigned long milliseconds); // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) WXDLLEXPORT long wxGetFreeMemory(); +// should wxApp::OnFatalException() be called? +WXDLLEXPORT bool wxHandleFatalExceptions(bool doit = TRUE); + // ---------------------------------------------------------------------------- // Network and username functions. // ---------------------------------------------------------------------------- @@ -196,6 +218,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 +229,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 +240,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 // ---------------------------------------------------------------------------- @@ -258,6 +289,22 @@ WXDLLEXPORT bool wxCheckForInterrupt(wxWindow *wnd); // Consume all events until no more left WXDLLEXPORT void wxFlushEvents(); +// a class which disables all windows (except, may be, thegiven one) in its +// ctor and enables them back in its dtor +class WXDLLEXPORT wxWindowDisabler +{ +public: + wxWindowDisabler(wxWindow *winToSkip = (wxWindow *)NULL); + ~wxWindowDisabler(); + +private: + wxWindowList *m_winDisabled; + +#ifdef __WXMSW__ + wxWindow *m_winTop; +#endif // MSW +}; + // ---------------------------------------------------------------------------- // Cursors // ---------------------------------------------------------------------------- @@ -279,25 +326,18 @@ class WXDLLEXPORT wxBusyCursor public: wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) { wxBeginBusyCursor(cursor); } - ~wxBusyCursor() + ~wxBusyCursor() { wxEndBusyCursor(); } -}; -// ---------------------------------------------------------------------------- -// Error message functions used by wxWindows (deprecated, use wxLog) -// ---------------------------------------------------------------------------- - -// Format a message on the standard error (UNIX) or the debugging -// stream (Windows) -WXDLLEXPORT void wxDebugMsg(const wxChar *fmt ...) ; - -// Non-fatal error (continues) -WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr; -WXDLLEXPORT void wxError(const wxString& msg, const wxString& title = wxInternalErrorStr); + // FIXME: These two methods are currently only implemented (and needed?) + // in wxGTK. BusyCursor handling should probably be moved to + // common code since the wxGTK and wxMSW implementations are very + // similar except for wxMSW using HCURSOR directly instead of + // wxCursor.. -- RL. + static const wxCursor &GetStoredCursor(); + static const wxCursor GetBusyCursor(); +}; -// Fatal error (exits) -WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr; -WXDLLEXPORT void wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr); // ---------------------------------------------------------------------------- // Reading and writing resources (eg WIN.INI, .Xdefaults) @@ -333,15 +373,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 +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #define wxMAX_RGB 0xff #define wxMAX_SV 1000 @@ -364,5 +415,24 @@ void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor); #endif //__X__ +#endif // wxUSE_GUI + +// ---------------------------------------------------------------------------- +// Error message functions used by wxWindows (deprecated, use wxLog) +// ---------------------------------------------------------------------------- + +// Format a message on the standard error (UNIX) or the debugging +// stream (Windows) +WXDLLEXPORT void wxDebugMsg(const wxChar *fmt ...); + +// Non-fatal error (continues) +WXDLLEXPORT_DATA(extern const wxChar*) wxInternalErrorStr; +WXDLLEXPORT void wxError(const wxString& msg, const wxString& title = wxInternalErrorStr); + +// Fatal error (exits) +WXDLLEXPORT_DATA(extern const wxChar*) wxFatalErrorStr; +WXDLLEXPORT void wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr); + + #endif // _WX_UTILSH__