Fix memory leak when a spacer is added, and crash when a window is added before wxSiz...

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

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index aa54a1ae8e1605f765e0fe29fafa97ead190700d..00b3fafcb5816656ab2f8e01acd73b040d62e60b 100644 (file)
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -8,26 +8,18 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

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

     #pragma implementation "dc.h"
 #endif
 
     #pragma implementation "dc.h"
 #endif
 

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

 #include "wx/dc.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "wx/dc.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#define mm2inches        0.0393700787402
-#define inches2mm        25.4
-#define mm2twips         56.6929133859
-#define twips2mm         0.0176388888889
-#define mm2pt            2.83464566929
-#define pt2mm            0.352777777778
-

 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------


@@ -62,11 +54,6 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
     m_clipY2 = y + height;
 }
 
     m_clipY2 = y + height;
 }
 

-void wxDC::DestroyClippingRegion()
-{
-    m_clipping = FALSE;
-}
-

 // ---------------------------------------------------------------------------
 // get DC capabilities
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // get DC capabilities
 // ---------------------------------------------------------------------------


@@ -119,7 +106,7 @@ void wxDC::SetMapMode( int mode )
           break;
     }
     m_mappingMode = mode;
           break;
     }
     m_mappingMode = mode;

-    
+

 /*  we don't do this mega optimisation
     if (mode != wxMM_TEXT)
     {
 /*  we don't do this mega optimisation
     if (mode != wxMM_TEXT)
     {