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

Pass correct length to XTextExtents

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-12 15:39:18 +00:00
parent 2034b74887
commit 56cb684ab2
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/x11/dcclient.cpp
View File

@@ -1233,7 +1233,10 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
y = YLOG2DEV(y); y = YLOG2DEV(y);
XCharStruct overall_return; XCharStruct overall_return;
int direction, slen, ascent, descent; int direction = 0;
int slen = text.Length();
int ascent = 0;
int descent = 0;
(void)XTextExtents((XFontStruct*) xfont, (char*) (const char*) text, slen, &direction, (void)XTextExtents((XFontStruct*) xfont, (char*) (const char*) text, slen, &direction,
&ascent, &descent, &overall_return); &ascent, &descent, &overall_return);
#if 0 #if 0

3
src/x11/toplevel.cpp
View File

@@ -95,7 +95,8 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
// TODO: For dialogs, this should be wxSYS_COLOUR_3DFACE // TODO: For dialogs, this should be wxSYS_COLOUR_3DFACE
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
m_backgroundColour.CalcPixel( (WXColormap) cm ); m_backgroundColour.CalcPixel( (WXColormap) cm );
m_hasBgCol = TRUE;
XSetWindowAttributes xattributes; XSetWindowAttributes xattributes;
XSizeHints size_hints; XSizeHints size_hints;
XWMHints wm_hints; XWMHints wm_hints;

4
src/x11/window.cpp
View File

@@ -138,6 +138,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
m_backgroundColour.CalcPixel( (WXColormap) cm ); m_backgroundColour.CalcPixel( (WXColormap) cm );
m_hasBgCol = TRUE;
m_foregroundColour = *wxBLACK; m_foregroundColour = *wxBLACK;
m_foregroundColour.CalcPixel( (WXColormap) cm ); m_foregroundColour.CalcPixel( (WXColormap) cm );
@@ -1313,8 +1314,7 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
bool wxWindowX11::SetBackgroundColour(const wxColour& col) bool wxWindowX11::SetBackgroundColour(const wxColour& col)
{ {
if ( !wxWindowBase::SetBackgroundColour(col) ) wxWindowBase::SetBackgroundColour(col);
return FALSE;
if (!GetMainWindow()) if (!GetMainWindow())
return FALSE; return FALSE;