added generic color dialog to setup

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index eb83a83ee005c16dfdead7029b36cb1609539e32..f0714b067a99305774f138b94d0860d40b1c77a8 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "control.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/app.h"
@@ -70,7 +72,7 @@ wxControl::wxControl()
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {
-#ifdef __UNIX__
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
         wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
 #else
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
@@ -136,6 +138,7 @@ void wxControl::SetLabel(const wxString& title)
 #endif
                ::SetControlTitle( m_macControl , maclabel ) ;
        }
+       Refresh() ;
 }
 
 wxSize wxControl::DoGetBestSize() const
@@ -270,6 +273,7 @@ void wxControl::MacPostControlCreate()
        m_macControlIsShown  = true ;
        MacAdjustControlRect() ;
        wxAssociateControlWithMacControl( m_macControl , this ) ;
+       UMAShowControl( m_macControl ) ;
 }
 
 void wxControl::MacAdjustControlRect() 
@@ -358,15 +362,15 @@ void wxControl::MacSuperChangedPosition()
        
                if ( mac_x != former_mac_x || mac_y != former_mac_y )
                {
-                       {
-                               Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
-                               InvalWindowRect( rootwindow , &inval ) ;
-                       }
+                       {
+                               Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
+                               InvalWindowRect( rootwindow , &inval ) ;
+                       }
                        UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
-                       {
-                               Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
-                               InvalWindowRect( rootwindow , &inval ) ;
-                       }
+                       {
+                               Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
+                               InvalWindowRect( rootwindow , &inval ) ;
+                       }
                }
                if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
                {
@@ -494,15 +498,15 @@ void  wxControl::DoSetSize(int x, int y,
        
        if ( mac_x != former_mac_x || mac_y != former_mac_y )
        {
-               {
-                       Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
-                       InvalWindowRect( macrootwindow, &inval ) ;
-               }
+               {
+                       Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
+                       InvalWindowRect( macrootwindow, &inval ) ;
+               }
                UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y  + m_macVerticalBorder ) ;
-               {
-                       Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
-                       InvalWindowRect(macrootwindow, &inval ) ;
-               }
+               {
+                       Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
+                       InvalWindowRect(macrootwindow, &inval ) ;
+               }
        }
 
        if ( actualX != former_x || actualY != former_y )
@@ -512,9 +516,10 @@ void  wxControl::DoSetSize(int x, int y,
 
                MacRepositionScrollBars() ;
                // To consider -> should the parameters be the effective or the virtual coordinates (AdjustForParent..)
-    wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+       wxPoint point(m_x, m_y);
+        wxMoveEvent event(point, m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
        }               
        if ( actualWidth != former_w || actualHeight != former_h )
        {
@@ -532,9 +537,10 @@ void  wxControl::DoSetSize(int x, int y,
                }
 
                MacRepositionScrollBars() ;
-    wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+       wxSize size(m_width, m_height);
+        wxSizeEvent event(size, m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
        }
        if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
        {
@@ -579,21 +585,10 @@ bool  wxControl::Enable(bool enable)
 
        if ( m_macControl )
        {
-               
-               if ( UMAHasAppearance() )
-               {
-                       if ( enable )
-                               ::ActivateControl( m_macControl ) ;
-                       else
-                               ::DeactivateControl( m_macControl ) ;
-               }
+               if ( enable )
+                   UMAActivateControl( m_macControl ) ;
                else
-               {
-                       if ( enable )
-                               ::HiliteControl( m_macControl , 0 ) ;
-                       else
-                               ::HiliteControl( m_macControl , 255 ) ;
-               }
+                   UMADeactivateControl( m_macControl ) ;
        }
        return TRUE ;
 }
@@ -646,7 +641,6 @@ void wxControl::MacRedrawControl()
                                
                                UMADrawControl( m_macControl ) ;
                                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-                               wxDC::MacInvalidateSetup() ;
                        }
                }
        }
@@ -665,8 +659,9 @@ void wxControl::OnPaint(wxPaintEvent& event)
                                wxMacDrawingHelper help( win ) ;
                                // the mac control manager always assumes to have the origin at 0,0
                                SetOrigin( 0 , 0 ) ;
+
                                
-                               bool                    hasTabBehind = false ;
+                               bool hasTabBehind = false ;
                                wxWindow* parent = GetParent() ;
                                while ( parent )
                                {
@@ -685,10 +680,9 @@ void wxControl::OnPaint(wxPaintEvent& event)
                                        
                                        parent = parent->GetParent() ;
                                } 
-                               
+
                                UMADrawControl( m_macControl ) ;
                                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-                               wxDC::MacInvalidateSetup() ;
                        }
                }
        }