Motif fixes, distribution script fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -592,12 +592,12 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
|
||||
wxRect clientRect = GetAvailableClientSize();
|
||||
pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height);
|
||||
|
||||
Refresh();
|
||||
|
||||
pPage->Show(TRUE);
|
||||
pPage->Raise();
|
||||
pPage->SetFocus();
|
||||
|
||||
Refresh();
|
||||
|
||||
m_nSelection = nSel;
|
||||
}
|
||||
|
||||
|
||||
@@ -747,11 +747,16 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
wxASSERT_MSG( m_cursor.Ok(),
|
||||
wxT("cursor must be valid after call to the base version"));
|
||||
// wxASSERT_MSG( m_cursor.Ok(),
|
||||
// wxT("cursor must be valid after call to the base version"));
|
||||
wxCursor* cursor2 = NULL;
|
||||
if (m_cursor.Ok())
|
||||
cursor2 = & m_cursor;
|
||||
else
|
||||
cursor2 = wxSTANDARD_CURSOR;
|
||||
|
||||
WXDisplay *dpy = GetXDisplay();
|
||||
WXCursor x_cursor = m_cursor.GetXCursor(dpy);
|
||||
WXCursor x_cursor = cursor2->GetXCursor(dpy);
|
||||
|
||||
Widget w = (Widget) GetMainWidget();
|
||||
Window win = XtWindow(w);
|
||||
|
||||
Reference in New Issue
Block a user