make sure gs_captureWindow is always set to NULL in DoReleaseMouse

[wxWidgets.git] / src / mgl / dc.cpp

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index 6d1111607dbdcbea5ba0e0e9950c491ee819a048..d462c90486d5bcef085dcc43d26e471de786e4c3 100644 (file)
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -47,6 +47,10 @@
 // constants
 //-----------------------------------------------------------------------------
 
 // 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;
 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 )
     {
     
     if ( palette == wxNullPalette )
     {

-        SetPalette(m_oldPalette);
+        if ( m_oldPalette.Ok() )
+            SetPalette(m_oldPalette);

         return;
     }
 
         return;
     }
 


@@ -1114,9 +1119,11 @@ void wxDC::SetPalette(const wxPalette& palette)
 
 void wxDC::SetFont(const wxFont& font)
 {
 
 void wxDC::SetFont(const wxFont& font)
 {

-    wxCHECK_RET( font.Ok(), wxT("invalid font") );
-    m_font = font;
-    m_mglFont = NULL;
+    if ( font.Ok() )
+    {
+        m_font = font;
+        m_mglFont = NULL;
+    }

 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 }
 
 void wxDC::SetBackground(const wxBrush& brush)