AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/motif/dcclient.h
View File

@ -168,6 +168,12 @@ protected:
int m_currentStyle ; int m_currentStyle ;
int m_currentFill ; int m_currentFill ;
int m_autoSetting ; // See comment in dcclient.cpp int m_autoSetting ; // See comment in dcclient.cpp
// this is useless and should be removed, kept for now just for backwards
// compatibility
#if wxCHECK_VERSION(2, 7, 0)
#error "Remove wxClientDC::m_oldFont"
#endif
WXFont m_oldFont; WXFont m_oldFont;
}; };

20
src/motif/dcclient.cpp
View File

@ -199,24 +199,11 @@ wxWindowDC::wxWindowDC( wxWindow *window )
m_backgroundPixel = (int) gcvalues.background; 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)); SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID));
} }
wxWindowDC::~wxWindowDC() 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) if (m_gc)
XFreeGC ((Display*) m_display, (GC) m_gc); XFreeGC ((Display*) m_display, (GC) m_gc);
m_gc = (WXGC) 0; m_gc = (WXGC) 0;
@ -1415,13 +1402,6 @@ void wxWindowDC::SetFont( const wxFont &font )
if (!m_font.Ok()) 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; return;
} }

13
src/motif/dcmemory.cpp
View File

@ -55,10 +55,6 @@ wxMemoryDC::wxMemoryDC(void)
m_backgroundPixel = (int) gcvalues.background; 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); SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN); SetPen (* wxBLACK_PEN);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
@ -86,10 +82,6 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
m_backgroundPixel = (int) gcvalues.background; 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); SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN); SetPen (* wxBLACK_PEN);
}; };
@ -124,11 +116,6 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
m_backgroundPixel = (int) gcvalues.background; m_backgroundPixel = (int) gcvalues.background;
m_ok = true; 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); SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN); SetPen (* wxBLACK_PEN);
} }