X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58045daa7ca94e20095ab7729b3f465bf1661a13..e83c4d401206ff9d5568f03ade6d9713c57bdd51:/src/motif/choice.cpp diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp index 10f3c3fccc..7557887c05 100644 --- a/src/motif/choice.cpp +++ b/src/motif/choice.cpp @@ -38,8 +38,6 @@ #define WIDTH_OVERHEAD_SUBTRACT 40 #define HEIGHT_OVERHEAD 15 -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) - void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer ptr); @@ -207,7 +205,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); @@ -431,7 +429,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;