scrollbar fixes and workaround for redraw problems w/o erase , setbitmap triggers refresh
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -63,6 +63,7 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
|
|||||||
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
|
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
|
||||||
{
|
{
|
||||||
m_messageBitmap = bitmap;
|
m_messageBitmap = bitmap;
|
||||||
|
Refresh() ;
|
||||||
SetSizeOrDefault();
|
SetSizeOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1855,7 +1855,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
|
|||||||
// eventually test for transparent windows
|
// eventually test for transparent windows
|
||||||
if ( child->GetMacRootWindow() == window && child->IsShown() )
|
if ( child->GetMacRootWindow() == window && child->IsShown() )
|
||||||
{
|
{
|
||||||
if ( !child->IsKindOf( CLASSINFO( wxNotebook ) ) && !child->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
|
if ( !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() )
|
||||||
{
|
{
|
||||||
SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
|
SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
|
||||||
DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
|
DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
|
||||||
|
@@ -63,6 +63,7 @@ void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
|
|||||||
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
|
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
|
||||||
{
|
{
|
||||||
m_messageBitmap = bitmap;
|
m_messageBitmap = bitmap;
|
||||||
|
Refresh() ;
|
||||||
SetSizeOrDefault();
|
SetSizeOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1855,7 +1855,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
|
|||||||
// eventually test for transparent windows
|
// eventually test for transparent windows
|
||||||
if ( child->GetMacRootWindow() == window && child->IsShown() )
|
if ( child->GetMacRootWindow() == window && child->IsShown() )
|
||||||
{
|
{
|
||||||
if ( !child->IsKindOf( CLASSINFO( wxNotebook ) ) && !child->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
|
if ( !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() )
|
||||||
{
|
{
|
||||||
SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
|
SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
|
||||||
DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
|
DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
|
||||||
|
Reference in New Issue
Block a user