Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / msw / graphics.cpp

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index 3c8e85fe8a99b3aaf7f4c1a6e6d1b428540d11e3..0bc82261429a7cdab52ba449caaf42f27fd19495 100644 (file)
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -1547,6 +1547,8 @@ void wxGDIPlusContext::PushState()
 
 void wxGDIPlusContext::PopState()
 {
 
 void wxGDIPlusContext::PopState()
 {

+    wxCHECK_RET( !m_stateStack.empty(), wxT("No state to pop") );
+

     GraphicsState state = m_stateStack.top();
     m_stateStack.pop();
     m_context->Restore(state);
     GraphicsState state = m_stateStack.top();
     m_stateStack.pop();
     m_context->Restore(state);


@@ -1904,7 +1906,7 @@ void wxGDIPlusRenderer::Unload()
     if ( m_gditoken )
     {
         GdiplusShutdown(m_gditoken);
     if ( m_gditoken )
     {
         GdiplusShutdown(m_gditoken);

-        m_gditoken = NULL;
+        m_gditoken = 0;

     }
     m_loaded = -1; // next Load() will try again
 }
     }
     m_loaded = -1; // next Load() will try again
 }