Added wxInfoBar::AddButton().

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 2453e7bd0d49ffb97f0aff2815dce161e0a20564..4a94ff07343aa981f8562ea6b1a82a5ba9fa32bd 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -96,7 +96,7 @@ static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),
     XtRemoveInput(*id);
 }
 
     XtRemoveInput(*id);
 }
 

-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
+int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)

 {
     XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
                                  fd,
 {
     XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
                                  fd,


@@ -375,7 +375,6 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc)
     }
 }
 
     }
 }
 

-#ifdef __WXDEBUG__

 wxString wxGetXEventName(XEvent& event)
 {
 #if wxUSE_NANOX
 wxString wxGetXEventName(XEvent& event)
 {
 #if wxUSE_NANOX


@@ -401,7 +400,6 @@ wxString wxGetXEventName(XEvent& event)
     return str;
 #endif
 }
     return str;
 #endif
 }

-#endif

 
 // ----------------------------------------------------------------------------
 // accelerators
 
 // ----------------------------------------------------------------------------
 // accelerators


@@ -542,7 +540,7 @@ void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColou
         return;
 
     wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
         return;
 
     wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,

-        (wxColour*) NULL);
+        NULL);

 
     XtVaSetValues ((Widget) widget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
 
     XtVaSetValues ((Widget) widget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,