X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b6a582bef796b43ad4cf0a96bd40bfd631460c6..88932ec82d048d006cdc81bd309f5e59aee799ac:/src/motif/utils.cpp?ds=sidebyside

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 4a94ff0734..ec1095d283 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -112,14 +112,11 @@ int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
 // ----------------------------------------------------------------------------
 
 // Emit a beeeeeep
-#ifndef __EMX__
-// on OS/2, we use the wxBell from wxBase library (src/os2/utils.cpp)
 void wxBell()
 {
     // Use current setting for the bell
     XBell (wxGlobalDisplay(), 0);
 }
-#endif
 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
 {
@@ -370,7 +367,7 @@ 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);
     }
 }
@@ -517,7 +514,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
@@ -536,7 +533,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,