Pass correct length to XTextExtents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -138,6 +138,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
|
||||
|
||||
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
|
||||
m_backgroundColour.CalcPixel( (WXColormap) cm );
|
||||
m_hasBgCol = TRUE;
|
||||
|
||||
m_foregroundColour = *wxBLACK;
|
||||
m_foregroundColour.CalcPixel( (WXColormap) cm );
|
||||
@@ -1313,8 +1314,7 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
|
||||
|
||||
bool wxWindowX11::SetBackgroundColour(const wxColour& col)
|
||||
{
|
||||
if ( !wxWindowBase::SetBackgroundColour(col) )
|
||||
return FALSE;
|
||||
wxWindowBase::SetBackgroundColour(col);
|
||||
|
||||
if (!GetMainWindow())
|
||||
return FALSE;
|
||||
|
Reference in New Issue
Block a user