update for 2.6.2 (patch 1294900)

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 26a81cff28e019baa87554b50ea833eb62813a51..6510b0d3dba9ac182475a21b5b8ccd222c5b97ce 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -65,9 +65,13 @@ static bool IsMapped(Display *display, Window window)
 
 // Suspends X11 errors. Used when we expect errors but they are not fatal
 // for us.
 
 // Suspends X11 errors. Used when we expect errors but they are not fatal
 // for us.

-extern "C" {
+extern "C"
+{
+    typedef int (*wxX11ErrorHandler)(Display *, XErrorEvent *);
+

     static int wxX11ErrorsSuspender_handler(Display*, XErrorEvent*) { return 0; }
 }
     static int wxX11ErrorsSuspender_handler(Display*, XErrorEvent*) { return 0; }
 }

+

 class wxX11ErrorsSuspender
 {
 public:
 class wxX11ErrorsSuspender
 {
 public:


@@ -83,7 +87,7 @@ public:
 
 private:
     Display *m_display;
 
 private:
     Display *m_display;

-    int (*m_old)(Display*, XErrorEvent *);
+    wxX11ErrorHandler m_old;

 };
 
 
 };