X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a624f6ed375e4dbf126743ff1068486cb5241a2..af33c0ec5f817ca4285cd9ef6f3285cf31e320dd:/src/common/dcbase.cpp diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index b63d7a4ed0..aea373f4ca 100644 --- 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,12 +58,24 @@ #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" @@ -72,6 +88,12 @@ #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 //---------------------------------------------------------------------------- @@ -316,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()