scrollbar fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 760c07680a91543be3bb019f8eba670f2e08b247..044002d970b1076ba6d8c912a834b55152996b82 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -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 ;
 
        while ( IsModalShowing() )
        s_macIsInModalLoop = true ;
 
        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
 

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 92d6dd1fafe7b9b1f1c27a2b6774ab810d21420f..fb7a5311ca5939eeff049e04a5823b58471f8a04 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -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() ;
 }

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index a99f6c4e69f80a1bf7bae1e728add2c3d8252700..33e784261d562bf4f91045a49702e2b2344c3d86 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -61,7 +61,7 @@ void wxStaticText::OnDraw( wxDC &dc )
         return;
 
     PrepareDC(dc);
         return;
 
     PrepareDC(dc);

-//    dc.Clear() ; this eventually draws in the wrong background colour (appearance panels)
+    dc.Clear() ;

     
     int x = 0 ;
     int y = 0 ;
     
     int x = 0 ;
     int y = 0 ;

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 48ac3429cf94573b01e0f0a926d91823f706f337..ec1e62b0d177810a6341d9a47dcd6c9149644596 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1277,7 +1277,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
                                {
                                        if ( !m_hScrollBar->IsShown() )
                                                m_hScrollBar->Show(true) ;
                                {
                                        if ( !m_hScrollBar->IsShown() )
                                                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() )
                                                m_vScrollBar->Show(true) ;
                                {
                                        if ( !m_vScrollBar->IsShown() )
                                                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() )
                                eraseBackground = true ;
 
                        if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
                                eraseBackground = true ;

-                       SetClip( updatergn ) ;
+                       SetClip( ownUpdateRgn ) ;

                        if ( m_macEraseOnRedraw ) {
                        if ( eraseBackground  )
                        {
                        if ( m_macEraseOnRedraw ) {
                        if ( eraseBackground  )
                        {

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 760c07680a91543be3bb019f8eba670f2e08b247..044002d970b1076ba6d8c912a834b55152996b82 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -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 ;
 
        while ( IsModalShowing() )
        s_macIsInModalLoop = true ;
 
        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
 

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index 92d6dd1fafe7b9b1f1c27a2b6774ab810d21420f..fb7a5311ca5939eeff049e04a5823b58471f8a04 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -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() ;
 }

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index a99f6c4e69f80a1bf7bae1e728add2c3d8252700..33e784261d562bf4f91045a49702e2b2344c3d86 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -61,7 +61,7 @@ void wxStaticText::OnDraw( wxDC &dc )
         return;
 
     PrepareDC(dc);
         return;
 
     PrepareDC(dc);

-//    dc.Clear() ; this eventually draws in the wrong background colour (appearance panels)
+    dc.Clear() ;

     
     int x = 0 ;
     int y = 0 ;
     
     int x = 0 ;
     int y = 0 ;

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 48ac3429cf94573b01e0f0a926d91823f706f337..ec1e62b0d177810a6341d9a47dcd6c9149644596 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -1277,7 +1277,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
                                {
                                        if ( !m_hScrollBar->IsShown() )
                                                m_hScrollBar->Show(true) ;
                                {
                                        if ( !m_hScrollBar->IsShown() )
                                                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() )
                                                m_vScrollBar->Show(true) ;
                                {
                                        if ( !m_vScrollBar->IsShown() )
                                                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() )
                                eraseBackground = true ;
 
                        if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
                                eraseBackground = true ;

-                       SetClip( updatergn ) ;
+                       SetClip( ownUpdateRgn ) ;

                        if ( m_macEraseOnRedraw ) {
                        if ( eraseBackground  )
                        {
                        if ( m_macEraseOnRedraw ) {
                        if ( eraseBackground  )
                        {