appearance brush support

[wxWidgets.git] / src / mac / control.cpp

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index f3973a3190f230f4cd51ab26b9731f9f37f1a6a7..55263a3a6b09fd3372f635002dd46090c3d127e2 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -386,7 +386,7 @@ void wxControl::MacAdjustControlRect()
             m_height += 2 * m_macVerticalBorder;
         }
         
             m_height += 2 * m_macVerticalBorder;
         }
         

-        wxMacDrawingHelper helper ( wxFindWinFromMacWindow( GetMacRootWindow() ) ) ;
+        wxMacDrawingHelper helper ( wxFindWinFromMacWindow( MacGetRootWindow() ) ) ;

         if ( helper.Ok() )
         {
             UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;
         if ( helper.Ok() )
         {
             UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;


@@ -411,14 +411,15 @@ void wxControl::MacSuperChangedPosition()
         int former_mac_y = contrlRect.top ;
         int mac_x = m_x ;
         int mac_y = m_y ;
         int former_mac_y = contrlRect.top ;
         int mac_x = m_x ;
         int mac_y = m_y ;

-        GetParent()->MacClientToRootWindow( & mac_x , & mac_y ) ;
+        GetParent()->MacWindowToRootWindow( & mac_x , & mac_y ) ;

         
         

-        WindowRef rootwindow = GetMacRootWindow() ;
+        WindowRef rootwindow = MacGetRootWindow() ;

         wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
         wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;

-        ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
+

         wxMacDrawingHelper focus( wxrootwindow ) ;
     
         wxMacDrawingHelper focus( wxrootwindow ) ;
     

-        if ( mac_x != former_mac_x || mac_y != former_mac_y )
+        if ( mac_x + m_macHorizontalBorder != former_mac_x || 
+            mac_y + m_macVerticalBorder != former_mac_y )

         {
             {
                 Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
         {
             {
                 Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;


@@ -430,13 +431,6 @@ void wxControl::MacSuperChangedPosition()
                 InvalWindowRect( rootwindow , &inval ) ;
             }
         }
                 InvalWindowRect( rootwindow , &inval ) ;
             }
         }

-        if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
-        {
-        }
-        else
-        {
-            ::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
-        }

     }
 
     wxWindow::MacSuperChangedPosition() ;
     }
 
     wxWindow::MacSuperChangedPosition() ;


@@ -444,36 +438,8 @@ void wxControl::MacSuperChangedPosition()
 
 void wxControl::MacSuperEnabled( bool enabled ) 
 {
 
 void wxControl::MacSuperEnabled( bool enabled ) 
 {

-/*
-    if ( m_macControl )
-    {
-        if ( UMAHasAppearance() )
-        {
-            if ( !enabled )
-            {
-                ::DeactivateControl( m_macControl ) ; 
-            }
-            else
-            {
-                if ( m_macEnabled )
-                    ::ActivateControl( m_macControl ) ;
-            }
-        }
-        else
-        {
-            if ( !enabled )
-            {
-                ::HiliteControl( m_macControl , 255 ) ;
-            }
-            else
-            {
-                if ( m_macEnabled )
-                    ::HiliteControl( m_macControl , 0 ) ;
-            }
-        }
-    }
+    Refresh(FALSE) ;

     wxWindow::MacSuperEnabled( enabled ) ;
     wxWindow::MacSuperEnabled( enabled ) ;

-*/

 }
 
 void  wxControl::MacSuperShown( bool show ) 
 }
 
 void  wxControl::MacSuperShown( bool show ) 


@@ -484,7 +450,7 @@ void  wxControl::MacSuperShown( bool show )
         {
             if ( m_macControlIsShown )
             {
         {
             if ( m_macControlIsShown )
             {

-                ::HideControl( m_macControl ) ;
+                ::UMAHideControl( m_macControl ) ;

                 m_macControlIsShown = false ;
             }
         }
                 m_macControlIsShown = false ;
             }
         }


@@ -547,12 +513,12 @@ void  wxControl::DoSetSize(int x, int y,
              if (height == -1)   new_height = size.y;
          }
      }
              if (height == -1)   new_height = size.y;
          }
      }

-     // AdjustForParentClientOrigin(new_x, new_y, sizeFlags);
+     AdjustForParentClientOrigin(new_x, new_y, sizeFlags);

  
      mac_x = new_x;
      mac_y = new_y;
      if(GetParent()) {
  
      mac_x = new_x;
      mac_y = new_y;
      if(GetParent()) {

-         GetParent()->MacClientToRootWindow(&mac_x, &mac_y);
+         GetParent()->MacWindowToRootWindow(&mac_x, &mac_y);

      }
      GetControlBounds(m_macControl, &oldbounds);
      oldbounds.right = oldbounds.left + m_width;
      }
      GetControlBounds(m_macControl, &oldbounds);
      oldbounds.right = oldbounds.left + m_width;


@@ -574,6 +540,8 @@ void  wxControl::DoSetSize(int x, int y,
  
      if ( doMove || doResize )
      {
  
      if ( doMove || doResize )
      {

+         Refresh() ;
+     

          // Ensure resize is within constraints
          if ((m_minWidth != -1) && (new_width < m_minWidth)) {
              new_width = m_minWidth;
          // Ensure resize is within constraints
          if ((m_minWidth != -1) && (new_width < m_minWidth)) {
              new_width = m_minWidth;


@@ -595,7 +563,7 @@ void  wxControl::DoSetSize(int x, int y,
  
              UMAMoveControl(m_macControl,
                             mac_x + m_macHorizontalBorder, mac_y + m_macVerticalBorder);
  
              UMAMoveControl(m_macControl,
                             mac_x + m_macHorizontalBorder, mac_y + m_macVerticalBorder);

- 
+

              wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
              event.SetEventObject(this);
              GetEventHandler()->ProcessEvent(event) ;
              wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
              event.SetEventObject(this);
              GetEventHandler()->ProcessEvent(event) ;


@@ -615,23 +583,7 @@ void  wxControl::DoSetSize(int x, int y,
              GetEventHandler()->ProcessEvent(event);
          }
  
              GetEventHandler()->ProcessEvent(event);
          }
  

-         // Set up port
-         WindowRef rootwindow = GetMacRootWindow() ;
-         wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-         wxMacDrawingHelper focus( wxrootwindow );
- 
-         ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
-         // Update window at old and new positions
-         SetRect(&newbounds, m_x, m_y, m_x + m_width, m_y + m_height);
-         InvalWindowRect( rootwindow , &oldbounds );
-         InvalWindowRect( rootwindow , &newbounds );
- 
-         MacRepositionScrollBars() ;
- 
-         if ( !wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
-         {
-             ::SetThemeWindowBackground( rootwindow, kThemeBrushDocumentWindowBackground, false );
-         }
+          Refresh() ;

      }
 }
 
      }
 }
 


@@ -646,7 +598,7 @@ bool  wxControl::Show(bool show)
         {
             if ( m_macControlIsShown )
             {
         {
             if ( m_macControlIsShown )
             {

-                ::HideControl( m_macControl ) ;
+                ::UMAHideControl( m_macControl ) ;

                 m_macControlIsShown = false ;
             }
         }
                 m_macControlIsShown = false ;
             }
         }


@@ -679,21 +631,14 @@ bool  wxControl::Enable(bool enable)
 
 void wxControl::Refresh(bool eraseBack, const wxRect *rect)
 {
 
 void wxControl::Refresh(bool eraseBack, const wxRect *rect)
 {

-  if ( m_macControl )
-  {

     wxWindow::Refresh( eraseBack , rect ) ;
     wxWindow::Refresh( eraseBack , rect ) ;

-    }
-  else
-  {
-    wxWindow::Refresh( eraseBack , rect ) ;
-  }

 }
 
 void wxControl::MacRedrawControl()
 {
     if ( m_macControl )
     {
 }
 
 void wxControl::MacRedrawControl()
 {
     if ( m_macControl )
     {

-        WindowRef window = GetMacRootWindow() ;
+        WindowRef window = MacGetRootWindow() ;

         if ( window )
         {
             wxWindow* win = wxFindWinFromMacWindow( window ) ;
         if ( window )
         {
             wxWindow* win = wxFindWinFromMacWindow( window ) ;


@@ -706,9 +651,9 @@ void wxControl::MacRedrawControl()
                 wxWindow* parent = GetParent() ;
                 while ( parent )
                 {
                 wxWindow* parent = GetParent() ;
                 while ( parent )
                 {

-                    if( parent->MacGetWindowData() )
+                    if( parent->IsTopLevel() )

                     {
                     {

-                        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+                    //    ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;

                         break ;
                     }
                     
                         break ;
                     }
                     


@@ -723,7 +668,7 @@ void wxControl::MacRedrawControl()
                 } 
                 
                 UMADrawControl( m_macControl ) ;
                 } 
                 
                 UMADrawControl( m_macControl ) ;

-                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+                // ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;

             }
         }
     }
             }
         }
     }


@@ -733,7 +678,7 @@ void wxControl::OnPaint(wxPaintEvent& event)
 {
     if ( m_macControl )
     {
 {
     if ( m_macControl )
     {

-        WindowRef window = GetMacRootWindow() ;
+        WindowRef window = MacGetRootWindow() ;

         if ( window )
         {
             wxWindow* win = wxFindWinFromMacWindow( window ) ;
         if ( window )
         {
             wxWindow* win = wxFindWinFromMacWindow( window ) ;


@@ -743,12 +688,13 @@ void wxControl::OnPaint(wxPaintEvent& event)
                 // the mac control manager always assumes to have the origin at 0,0
                 SetOrigin( 0 , 0 ) ;
 
                 // the mac control manager always assumes to have the origin at 0,0
                 SetOrigin( 0 , 0 ) ;
 

+                /*

                 wxWindow* parent = GetParent() ;
                 while ( parent )
                 {
                 wxWindow* parent = GetParent() ;
                 while ( parent )
                 {

-                    if( parent->MacGetWindowData() )
+                    if( parent->IsTopLevel() )

                     {
                     {

-                        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+                    //    ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;

                         break ;
                     }
                     
                         break ;
                     }
                     


@@ -761,9 +707,10 @@ void wxControl::OnPaint(wxPaintEvent& event)
                     
                     parent = parent->GetParent() ;
                 } 
                     
                     parent = parent->GetParent() ;
                 } 

-
+                */
+                SetUpControlBackground( m_macControl , -1 , true ) ;

                 UMADrawControl( m_macControl ) ;
                 UMADrawControl( m_macControl ) ;

-                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+                // ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;

             }
         }
     }
             }
         }
     }


@@ -774,10 +721,7 @@ void wxControl::OnPaint(wxPaintEvent& event)
 }
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {
 }
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 {

-    // In general, you don't want to erase the background of a control,
-    // or you'll get a flicker.
-    // TODO: move this 'null' function into each control that
-    // might flicker.
+    wxWindow::OnEraseBackground( event ) ; 

 }
 
 
 }
 
 


@@ -814,7 +758,7 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
         ControlHandle   control ;
         Point       localwhere ;
         SInt16      controlpart ;
         ControlHandle   control ;
         Point       localwhere ;
         SInt16      controlpart ;

-        WindowRef   window = GetMacRootWindow() ;
+        WindowRef   window = MacGetRootWindow() ;

         
         localwhere.h = x ;
         localwhere.v = y ;
         
         localwhere.h = x ;
         localwhere.v = y ;