dlopen fixes

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 2c179d7a2d903466c13a83415c0e97baf2b1e6d9..7836a95070695d2ff58b0d0542f133300c055d13 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -538,10 +538,11 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */
         return m_mainColormap;
+
+    int defaultScreen = DefaultScreen((Display*) display);
+    Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen);
     
-    Colormap c =
-        DefaultColormapOfScreen(XScreenOfDisplay((Display*) display,
-        DefaultScreen((Display*) display)));
+    Colormap c = DefaultColormapOfScreen(screen);
     
     if (!m_mainColormap)
         m_mainColormap = (WXColormap) c;