1. fixed memory leak in GAddress
2. fixed memory leak with wxLogStderr in wxBase 3. updated tmake files/makefiles for wxBase with wxSocket under MSW 4. fixed wxSashWindow cursor bug by allowing SetCursor(wxNullCursor) 5. fixed warning in gsock*.c git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -586,16 +586,15 @@ bool wxWindowBase::SetForegroundColour( const wxColour &colour )
|
||||
|
||||
bool wxWindowBase::SetCursor(const wxCursor& cursor)
|
||||
{
|
||||
// don't try to set invalid cursor, always fall back to the default
|
||||
const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
|
||||
|
||||
if ( (wxCursor&)cursorOk == m_cursor )
|
||||
// setting an invalid cursor is ok, it means that we don't have any special
|
||||
// cursor
|
||||
if ( cursor == m_cursor )
|
||||
{
|
||||
// no change
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
m_cursor = cursorOk;
|
||||
m_cursor = cursor;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
Reference in New Issue
Block a user