moved wxDebugMsg, wxFatalError, wxError out of #if wxUSE_GUI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -324,21 +324,6 @@ public:
|
|||||||
{ wxEndBusyCursor(); }
|
{ 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);
|
|
||||||
|
|
||||||
// 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)
|
// Reading and writing resources (eg WIN.INI, .Xdefaults)
|
||||||
@@ -418,5 +403,22 @@ void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
|
|||||||
|
|
||||||
#endif // wxUSE_GUI
|
#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
|
#endif
|
||||||
// _WX_UTILSH__
|
// _WX_UTILSH__
|
||||||
|
Reference in New Issue
Block a user