X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1294ada8e87725409f290328da02306e5c8f4eb..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/motif/listbox.cpp diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp index 3d138f6435..da952a3627 100644 --- a/src/motif/listbox.cpp +++ b/src/motif/listbox.cpp @@ -24,11 +24,6 @@ #include "wx/arrstr.h" #endif -#ifdef __VMS -#define XtParent XTPARENT -#define XtDisplay XTDISPLAY -#endif - #ifdef __VMS__ #pragma message disable nosimpint #endif @@ -38,8 +33,6 @@ #endif #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) - static void wxListBoxCallback(Widget w, XtPointer clientData, XmListCallbackStruct * cbs); @@ -108,7 +101,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT : XmBROWSE_SELECT ); ++count; - if( m_font.Ok() ) + if( m_font.IsOk() ) { XtSetArg( args[count], (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) ); @@ -490,7 +483,7 @@ void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData, item->DoToggleItem( n, x ); #endif case XmCR_DEFAULT_ACTION: - item->GetEventHandler()->ProcessEvent(event); + item->HandleWindowEvent(event); break; case XmCR_EXTENDED_SELECT: switch (cbs->selection_type) @@ -499,7 +492,7 @@ void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData, case XmADDITION: case XmMODIFICATION: item->DoToggleItem( n, x ); - item->GetEventHandler()->ProcessEvent(event); + item->HandleWindowEvent(event); break; } break;