Fixed undo batching

[wxWidgets.git] / src / common / dcbase.cpp

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index e48e874e07134d5e50d7ed076234589b1528d2c7..aea373f4ca7ac5bc3e5327202a8d7a2bbed755df 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -42,10 +42,14 @@
     #include "wx/msw/dcscreen.h"
 #endif
 
-#ifdef __WXGTK__
+#ifdef __WXGTK20__
     #include "wx/gtk/dcclient.h"
     #include "wx/gtk/dcmemory.h"
     #include "wx/gtk/dcscreen.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/dcclient.h"
+    #include "wx/gtk1/dcmemory.h"
+    #include "wx/gtk1/dcscreen.h"
 #endif
 
 #ifdef __WXMAC__
@@ -54,18 +58,42 @@
     #include "wx/mac/dcscreen.h"
 #endif
 
+#ifdef __WXPM__
+    #include "wx/os2/dcclient.h"
+    #include "wx/os2/dcmemory.h"
+    #include "wx/os2/dcscreen.h"
+#endif
+
 #ifdef __WXCOCOA__
     #include "wx/cocoa/dcclient.h"
     #include "wx/cocoa/dcmemory.h"
     #include "wx/cocoa/dcscreen.h"
 #endif
 
+#ifdef __WXMOTIF__
+    #include "wx/motif/dcclient.h"
+    #include "wx/motif/dcmemory.h"
+    #include "wx/motif/dcscreen.h"
+#endif
+
 #ifdef __WXX11__
     #include "wx/x11/dcclient.h"
     #include "wx/x11/dcmemory.h"
     #include "wx/x11/dcscreen.h"
 #endif
 
+#ifdef __WXDFB__
+    #include "wx/dfb/dcclient.h"
+    #include "wx/dfb/dcmemory.h"
+    #include "wx/dfb/dcscreen.h"
+#endif
+
+#ifdef __WXPALMOS__
+    #include "wx/palmos/dcclient.h"
+    #include "wx/palmos/dcmemory.h"
+    #include "wx/palmos/dcscreen.h"
+#endif
+
 //----------------------------------------------------------------------------
 // wxDCFactory
 //----------------------------------------------------------------------------
@@ -310,7 +338,7 @@ wxDCImpl::wxDCImpl( wxDC *owner )
         , m_mappingMode(wxMM_TEXT)
         , m_pen()
         , m_brush()
-        , m_backgroundBrush(*wxTRANSPARENT_BRUSH)
+        , m_backgroundBrush()
         , m_textForegroundColour(*wxBLACK)
         , m_textBackgroundColour(*wxWHITE)
         , m_font()