[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 1ddb082650958904847a4244e2b25132c36f770e..d0f70c18c4738ba6be7c7284d78bb5c4b4c963d3 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -9,10 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "bmpmotif.h"
 #endif
 
 #pragma implementation "bmpmotif.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY
 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY


@@ -34,7 +37,8 @@
 #if wxHAVE_LIB_XPM
     #include <X11/xpm.h>
 #endif
 #if wxHAVE_LIB_XPM
     #include <X11/xpm.h>
 #endif

-#include <math.h>
+
+#include "wx/math.h"

 
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 
 
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );