Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 595e14696abcd9ba33e3c940e331bdebbcdcb524..5fd3aeefb82b51b18d5743f1d06f97d7424923b0 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -20,10 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-

 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP


@@ -100,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,


@@ -374,12 +370,11 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc)
 {
     if (!XAllocColor(d,cmp,xc))
     {
 {
     if (!XAllocColor(d,cmp,xc))
     {

-        //          cout << "wxAllocColor : Warning : Can not allocate color, attempt find nearest !\n";
+        //          cout << "wxAllocColor : Warning : cannot allocate color, attempt find nearest !\n";

         wxAllocNearestColor(d,cmp,xc);
     }
 }
 
         wxAllocNearestColor(d,cmp,xc);
     }
 }
 

-#ifdef __WXDEBUG__

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


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

-#endif

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


@@ -523,7 +517,7 @@ XmString wxFindAcceleratorText (const char *s)
 // Change a widget's foreground and background colours.
 void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 {
 // 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
         return;
 
     // When should we specify the foreground, if it's calculated


@@ -542,11 +536,11 @@ void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 
 void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColour, bool changeArmColour)
 {
 
 void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColour, bool changeArmColour)
 {

-    if (!backgroundColour.Ok())
+    if (!backgroundColour.IsOk())

         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,