Added code to wxMemoryDC ctor to set default font. This fixes the controls
sample which was crashing when calling wxDC::DrawText. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,6 +14,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/dcmemory.h"
|
#include "wx/dcmemory.h"
|
||||||
|
#include "wx/settings.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
@@ -50,6 +51,7 @@ wxMemoryDC::wxMemoryDC(void)
|
|||||||
m_oldFont = (WXFont) valReturn.font;
|
m_oldFont = (WXFont) valReturn.font;
|
||||||
SetBrush (* wxWHITE_BRUSH);
|
SetBrush (* wxWHITE_BRUSH);
|
||||||
SetPen (* wxBLACK_PEN);
|
SetPen (* wxBLACK_PEN);
|
||||||
|
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
|
||||||
};
|
};
|
||||||
|
|
||||||
wxMemoryDC::wxMemoryDC( wxDC* dc )
|
wxMemoryDC::wxMemoryDC( wxDC* dc )
|
||||||
|
Reference in New Issue
Block a user