create stock GDI objects on demand; use const with GDI objects appropriately (patch 1445355)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -693,7 +693,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
|
||||
|
||||
// wxASSERT_MSG( m_cursor.Ok(),
|
||||
// wxT("cursor must be valid after call to the base version"));
|
||||
wxCursor* cursor2 = NULL;
|
||||
const wxCursor* cursor2 = NULL;
|
||||
if (m_cursor.Ok())
|
||||
cursor2 = & m_cursor;
|
||||
else
|
||||
@@ -2377,7 +2377,7 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
|
||||
|
||||
#define YAllocColor XAllocColor
|
||||
XColor g_itemColors[5];
|
||||
int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
|
||||
int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore)
|
||||
{
|
||||
int result;
|
||||
static XmColorProc colorProc;
|
||||
|
Reference in New Issue
Block a user