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

Fix buffer overrun in Linux/x86_64 (Pixel is a 64 bit long, passing

Browse Source 
a 32 bit int pointer to XtVaGetValues will cause trouble). Using a long
should suffice. A configure test would be better.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2006-10-05 19:34:25 +00:00
parent 07a84e7bbb
commit 3e0071d949
15 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/motif/colour.h
View File

@@ -41,8 +41,8 @@ public:
unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; }
int GetPixel() const { return m_pixel; };
void SetPixel(int pixel) { m_pixel = pixel; m_isInit = true; };
WXPixel GetPixel() const { return m_pixel; };
void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; };
inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
@@ -56,7 +56,7 @@ public:
// TODO: can this handle mono displays? If not, we should have an extra
// flag to specify whether this should be black or white by default.
int AllocColour(WXDisplay* display, bool realloc = false);
WXPixel AllocColour(WXDisplay* display, bool realloc = false);
protected:
// Helper function
@@ -72,7 +72,7 @@ private:
unsigned char m_green;
public:
int m_pixel;
WXPixel m_pixel;
};
#endif