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

scrollbar fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-05-23 06:15:16 +00:00
parent 06f3c649c9
commit a49afa93ca
8 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mac/carbon/dialog.cpp
View File

@@ -215,6 +215,7 @@ void wxDialog::DoShowModal()
} }
// TODO : test whether parent gets disabled // TODO : test whether parent gets disabled
bool formerModal = s_macIsInModalLoop ;
s_macIsInModalLoop = true ; s_macIsInModalLoop = true ;
while ( IsModalShowing() ) while ( IsModalShowing() )
@@ -225,7 +226,7 @@ void wxDialog::DoShowModal()
wxTheApp->MacDoOneEvent() ; wxTheApp->MacDoOneEvent() ;
} }
s_macIsInModalLoop = false ; s_macIsInModalLoop = formerModal ;
// TODO probably reenable the parent window if any // TODO probably reenable the parent window if any

5
src/mac/carbon/scrolbar.cpp
View File

@@ -82,9 +82,10 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
if ( UMAGetAppearanceVersion() >= 0x0110 ) if ( UMAGetAppearanceVersion() >= 0x0110 )
{ {
#if UMA_USE_8_6 if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
{
SetControlViewSize( m_macControl , m_pageSize ) ; SetControlViewSize( m_macControl , m_pageSize ) ;
#endif }
} }
Refresh() ; Refresh() ;
} }

2
src/mac/carbon/stattext.cpp
View File

@@ -61,7 +61,7 @@ void wxStaticText::OnDraw( wxDC &dc )
return; return;
PrepareDC(dc); PrepareDC(dc);
// dc.Clear() ; this eventually draws in the wrong background colour (appearance panels) dc.Clear() ;
int x = 0 ; int x = 0 ;
int y = 0 ; int y = 0 ;

6
src/mac/carbon/window.cpp
View File

@@ -1277,7 +1277,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
{ {
if ( !m_hScrollBar->IsShown() ) if ( !m_hScrollBar->IsShown() )
m_hScrollBar->Show(true) ; m_hScrollBar->Show(true) ;
m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
} }
} }
} }
@@ -1294,7 +1294,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
{ {
if ( !m_vScrollBar->IsShown() ) if ( !m_vScrollBar->IsShown() )
m_vScrollBar->Show(true) ; m_vScrollBar->Show(true) ;
m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
} }
} }
} }
@@ -1866,7 +1866,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() ) if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
eraseBackground = true ; eraseBackground = true ;
SetClip( updatergn ) ; SetClip( ownUpdateRgn ) ;
if ( m_macEraseOnRedraw ) { if ( m_macEraseOnRedraw ) {
if ( eraseBackground ) if ( eraseBackground )
{ {

3
src/mac/dialog.cpp
View File

@@ -215,6 +215,7 @@ void wxDialog::DoShowModal()
} }
// TODO : test whether parent gets disabled // TODO : test whether parent gets disabled
bool formerModal = s_macIsInModalLoop ;
s_macIsInModalLoop = true ; s_macIsInModalLoop = true ;
while ( IsModalShowing() ) while ( IsModalShowing() )
@@ -225,7 +226,7 @@ void wxDialog::DoShowModal()
wxTheApp->MacDoOneEvent() ; wxTheApp->MacDoOneEvent() ;
} }
s_macIsInModalLoop = false ; s_macIsInModalLoop = formerModal ;
// TODO probably reenable the parent window if any // TODO probably reenable the parent window if any

5
src/mac/scrolbar.cpp
View File

@@ -82,9 +82,10 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
if ( UMAGetAppearanceVersion() >= 0x0110 ) if ( UMAGetAppearanceVersion() >= 0x0110 )
{ {
#if UMA_USE_8_6 if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
{
SetControlViewSize( m_macControl , m_pageSize ) ; SetControlViewSize( m_macControl , m_pageSize ) ;
#endif }
} }
Refresh() ; Refresh() ;
} }

2
src/mac/stattext.cpp
View File

@@ -61,7 +61,7 @@ void wxStaticText::OnDraw( wxDC &dc )
return; return;
PrepareDC(dc); PrepareDC(dc);
// dc.Clear() ; this eventually draws in the wrong background colour (appearance panels) dc.Clear() ;
int x = 0 ; int x = 0 ;
int y = 0 ; int y = 0 ;

6
src/mac/window.cpp
View File

@@ -1277,7 +1277,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
{ {
if ( !m_hScrollBar->IsShown() ) if ( !m_hScrollBar->IsShown() )
m_hScrollBar->Show(true) ; m_hScrollBar->Show(true) ;
m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
} }
} }
} }
@@ -1294,7 +1294,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
{ {
if ( !m_vScrollBar->IsShown() ) if ( !m_vScrollBar->IsShown() )
m_vScrollBar->Show(true) ; m_vScrollBar->Show(true) ;
m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
} }
} }
} }
@@ -1866,7 +1866,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() ) if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
eraseBackground = true ; eraseBackground = true ;
SetClip( updatergn ) ; SetClip( ownUpdateRgn ) ;
if ( m_macEraseOnRedraw ) { if ( m_macEraseOnRedraw ) {
if ( eraseBackground ) if ( eraseBackground )
{ {