Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of wxClientDC::m_oldFont, it wasn't really used (this fixes crash introduced by last change to this code)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-18 01:19:28 +00:00
parent 72e4e6a397
commit c74b77ed51
3 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/motif/dcmemory.cpp
View File

@@ -55,10 +55,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 +82,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,11 +116,6 @@ 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);
}