X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2831eb2dd5694a783d2a6ddf476d0695407c121a..3b96fc2f1b64f78bba7c755a5c14f618962f696b:/src/motif/dcclient.cpp diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index 3ab64e3425..df2cdf3fa3 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -36,10 +36,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dcclient.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -199,24 +195,11 @@ wxWindowDC::wxWindowDC( wxWindow *window ) 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; - SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID)); } wxWindowDC::~wxWindowDC() { - if (m_gc && m_oldFont) - { - XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont); - - if (m_window && m_window->GetBackingPixmap()) - XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont); - } - if (m_gc) XFreeGC ((Display*) m_display, (GC) m_gc); m_gc = (WXGC) 0; @@ -1415,13 +1398,6 @@ void wxWindowDC::SetFont( const wxFont &font ) if (!m_font.Ok()) { - if (m_oldFont) - { - XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont); - - if (m_window && m_window->GetBackingPixmap()) - XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont); - } return; }