fix building with WXWIN_COMPATIBILITY_2_8 == 0

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 32ae77bab493b67eb052581867ce1d9afa236792..ce9555df7501f3cf40bd5404ac5d73ab77a3d316 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -205,7 +204,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
 
         wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
 
-        if( m_font.Ok() )
+        if( m_font.IsOk() )
             wxDoChangeFont( w, m_font );
 
         m_widgetArray.Insert(w, pos);
@@ -411,7 +410,7 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         int n = item->GetWidgets().Index(w);
         if (n != wxNOT_FOUND)
         {
-            wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
+            wxCommandEvent event(wxEVT_CHOICE, item->GetId());
             event.SetEventObject(item);
             event.SetInt(n);
             event.SetString( item->GetStrings().Item(n) );
@@ -429,7 +428,7 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
     // Note that this causes the widget to be resized back
     // to its original size! We therefore have to set the size
     // back again. TODO: a better way in Motif?
-    if (m_mainWidget && m_font.Ok())
+    if (m_mainWidget && m_font.IsOk())
     {
         Display* dpy = XtDisplay((Widget) m_mainWidget);
         int width, height, width1, height1;