X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea76a6a5ca75f8e623982de97f7f7b2746b5ee50..84882850e5e71939d541c1788b8446576a41ca30:/src/motif/dcmemory.cpp diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp index 8bf23e219b..19d75551f9 100644 --- a/src/motif/dcmemory.cpp +++ b/src/motif/dcmemory.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dcmemory.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -55,10 +51,6 @@ wxMemoryDC::wxMemoryDC(void) m_backgroundPixel = (int) gcvalues.background; - // Get the current Font so we can set it back later - XGCValues valReturn; - XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn); - m_oldFont = (WXFont) valReturn.font; SetBrush (* wxWHITE_BRUSH); SetPen (* wxBLACK_PEN); SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); @@ -86,10 +78,6 @@ wxMemoryDC::wxMemoryDC( wxDC* dc ) m_backgroundPixel = (int) gcvalues.background; - // Get the current Font so we can set it back later - XGCValues valReturn; - XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn); - m_oldFont = (WXFont) valReturn.font; SetBrush (* wxWHITE_BRUSH); SetPen (* wxBLACK_PEN); }; @@ -124,17 +112,12 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) m_backgroundPixel = (int) gcvalues.background; m_ok = true; - // Get the current Font so we can set it back later - XGCValues valReturn; - XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn); - m_oldFont = (WXFont) valReturn.font; - SetBrush (* wxWHITE_BRUSH); SetPen (* wxBLACK_PEN); } else { - m_ok = FALSE; + m_ok = false; m_pixmap = (WXPixmap) 0; }; };