X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..04fa04d8067d235ab45b5bc05b65f0679634b541:/src/motif/utils.cpp diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 4eda0e2f08..5fd3aeefb8 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -370,12 +370,11 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc) { if (!XAllocColor(d,cmp,xc)) { - // cout << "wxAllocColor : Warning : Can not allocate color, attempt find nearest !\n"; + // cout << "wxAllocColor : Warning : cannot allocate color, attempt find nearest !\n"; wxAllocNearestColor(d,cmp,xc); } } -#ifdef __WXDEBUG__ wxString wxGetXEventName(XEvent& event) { #if wxUSE_NANOX @@ -401,7 +400,6 @@ wxString wxGetXEventName(XEvent& event) return str; #endif } -#endif // ---------------------------------------------------------------------------- // accelerators @@ -519,7 +517,7 @@ XmString wxFindAcceleratorText (const char *s) // Change a widget's foreground and background colours. void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour) { - if (!foregroundColour.Ok()) + if (!foregroundColour.IsOk()) return; // When should we specify the foreground, if it's calculated @@ -538,7 +536,7 @@ void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour) void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColour, bool changeArmColour) { - if (!backgroundColour.Ok()) + if (!backgroundColour.IsOk()) return; wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,