Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

[wxWidgets.git] / src / motif / utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 6b344063274b06ed0501e5864fb43a67c2261c60..ec1095d283926617aafafd72b5000c8ae1276649 100644 (file)
--- 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
 {
@@ -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,