X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31e39e3c51f0a14a49ba86a5326e1461ad60dfee..a92b0cfd2bd0bef75b43c071df0b0e028f360d8e:/src/mgl/dc.cpp

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index 692ac021d4..d462c90486 100644
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -47,6 +47,10 @@
 // constants
 //-----------------------------------------------------------------------------
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 const double mm2inches      = 0.0393700787402;
 const double inches2mm      = 25.4;
 const double mm2twips       = 56.6929133859;
@@ -1097,7 +1101,8 @@ void wxDC::SetPalette(const wxPalette& palette)
     
     if ( palette == wxNullPalette )
     {
-        SetPalette(m_oldPalette);
+        if ( m_oldPalette.Ok() )
+            SetPalette(m_oldPalette);
         return;
     }