added a call for invalidating the dc setup on mac explicitely (needed in case of...

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 220ff1e0a9d84e917fdd2e01d26e417a33794a85..3e5679a826fe5876a508e810586a3a63e4019643 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -14,9 +14,18 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+#include "wx/panel.h"
+#include "wx/app.h"

 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

+#include "wx/radiobox.h"

 #include "wx/spinbutt.h"
 #include "wx/spinbutt.h"

+#include "wx/scrolbar.h"
+#include "wx/button.h"
+#include "wx/dialog.h"
+#include "wx/statbox.h"
+#include "wx/sizer.h"
+#include "wx/stattext.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)


@@ -34,6 +43,7 @@ END_EVENT_TABLE()
 
 ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
 
 
 ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
 

+pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode ) ;

 pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode )
 {
        if ( partCode != 0)
 pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode )
 {
        if ( partCode != 0)


@@ -48,9 +58,9 @@ pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCod
 
 wxControl::wxControl()
 {
 
 wxControl::wxControl()
 {

-               m_macControl = NULL ;
-               m_macHorizontalBorder = 0 ; // additional pixels around the real control
-               m_macVerticalBorder = 0 ;
+       m_macControl = NULL ;
+       m_macHorizontalBorder = 0 ; // additional pixels around the real control
+       m_macVerticalBorder = 0 ;

     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 #if WXWIN_COMPATIBILITY
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 #if WXWIN_COMPATIBILITY


@@ -59,10 +69,32 @@ wxControl::wxControl()
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {

+#ifdef __UNIX__
+        wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
+#else

                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;

+#endif

        }
 }
 
        }
 }
 

+bool wxControl::Create(wxWindow *parent, wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size, long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+       m_macControl = NULL ;
+       m_macHorizontalBorder = 0 ; // additional pixels around the real control
+       m_macVerticalBorder = 0 ;
+    bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+    if (rval) {
+#if wxUSE_VALIDATORS
+        SetValidator(validator);
+#endif
+    }
+    return rval;
+}
+

 wxControl::~wxControl()
 {
     m_isBeingDeleted = TRUE;
 wxControl::~wxControl()
 {
     m_isBeingDeleted = TRUE;


@@ -95,14 +127,17 @@ void wxControl::SetLabel(const wxString& title)
                else
                        label = title ;
                
                else
                        label = title ;
                

-               strcpy( (char*) maclabel , label ) ;
-               c2pstr( (char*) maclabel ) ;
-       
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) maclabel , label ) ;
+#else
+               strcpy( (char *) maclabel , label ) ;
+               c2pstr( (char *) maclabel ) ;
+#endif

                ::SetControlTitle( m_macControl , maclabel ) ;
        }
 }
 
                ::SetControlTitle( m_macControl , maclabel ) ;
        }
 }
 

-wxSize wxControl::DoGetBestSize()
+wxSize wxControl::DoGetBestSize() const

 {
     return wxSize(20, 20);
 }
 {
     return wxSize(20, 20);
 }


@@ -183,22 +218,25 @@ void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString l
        m_y = y ;
                
 
        m_y = y ;
                
 

-       Point localOrigin ;
-       Rect    clipRect ;
-       

        parent->MacClientToRootWindow( &x , &y ) ;
        outBounds->top = y + m_macVerticalBorder ;
        outBounds->left = x + m_macHorizontalBorder ;
        outBounds->bottom = outBounds->top + m_height - 2 * m_macVerticalBorder;
        outBounds->right = outBounds->left + m_width - 2 * m_macHorizontalBorder ;
 
        parent->MacClientToRootWindow( &x , &y ) ;
        outBounds->top = y + m_macVerticalBorder ;
        outBounds->left = x + m_macHorizontalBorder ;
        outBounds->bottom = outBounds->top + m_height - 2 * m_macVerticalBorder;
        outBounds->right = outBounds->left + m_width - 2 * m_macHorizontalBorder ;
 

-       strcpy( (char*) maclabel , label ) ;
+       char c_text[255];
+       strcpy( c_text , label ) ;

        if( wxApp::s_macDefaultEncodingIsPC )
        {
        if( wxApp::s_macDefaultEncodingIsPC )
        {

-               wxMacConvertFromPCForControls( (char*) maclabel ) ;
+               wxMacConvertFromPCForControls( c_text ) ;

        }
 
        }
 

-       c2pstr( (char*) maclabel ) ;
+#if TARGET_CARBON
+       c2pstrcpy( (StringPtr) maclabel , c_text ) ;
+#else
+       strcpy( (char *) maclabel , c_text ) ;
+       c2pstr( (char *) maclabel ) ;
+#endif

 }
 
 void wxControl::MacPostControlCreate()
 }
 
 void wxControl::MacPostControlCreate()


@@ -209,7 +247,7 @@ void wxControl::MacPostControlCreate()
        {
                // no font
        }
        {
                // no font
        }

-       else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
+       else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) )

        {
                ControlFontStyleRec             controlstyle ;
                controlstyle.flags = kControlUseFontMask ;
        {
                ControlFontStyleRec             controlstyle ;
                controlstyle.flags = kControlUseFontMask ;


@@ -262,14 +300,16 @@ void wxControl::MacAdjustControlRect()
                {
                        if ( IsKindOf( CLASSINFO( wxButton ) ) )
                        {
                {
                        if ( IsKindOf( CLASSINFO( wxButton ) ) )
                        {

-                               m_width = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
+                               m_width = m_label.Length() * 8 + 12 ;

                        }
                        else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
                        {
                                m_width = m_label.Length() * 8 ;
                        }
                        else
                        }
                        else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
                        {
                                m_width = m_label.Length() * 8 ;
                        }
                        else

-                               m_width = bestsize.right - bestsize.left + 2 * m_macHorizontalBorder;
+                               m_width = bestsize.right - bestsize.left ;
+                       
+                       m_width += 2 * m_macHorizontalBorder ;

                }
                if ( m_height == -1 )
                {
                }
                if ( m_height == -1 )
                {


@@ -283,7 +323,7 @@ void wxControl::MacAdjustControlRect()
                wxMacDrawingHelper helper ( wxFindWinFromMacWindow( GetMacRootWindow() ) ) ;
                if ( helper.Ok() )
                {
                wxMacDrawingHelper helper ( wxFindWinFromMacWindow( GetMacRootWindow() ) ) ;
                if ( helper.Ok() )
                {

-           UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;
+               UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;

                }
        }
 }
                }
        }
 }


@@ -299,8 +339,10 @@ void wxControl::MacSuperChangedPosition()
 {
        if ( m_macControl )
        {
 {
        if ( m_macControl )
        {

-               int former_mac_x = (**m_macControl).contrlRect.left ;
-               int former_mac_y = (**m_macControl).contrlRect.top ;
+               Rect contrlRect ;               
+               GetControlBounds( m_macControl , &contrlRect ) ; 
+               int former_mac_x = contrlRect.left ;
+               int former_mac_y = contrlRect.top ;

                int mac_x = m_x ;
                int mac_y = m_y ;
                GetParent()->MacClientToRootWindow( & mac_x , & mac_y ) ;
                int mac_x = m_x ;
                int mac_y = m_y ;
                GetParent()->MacClientToRootWindow( & mac_x , & mac_y ) ;


@@ -314,12 +356,12 @@ void wxControl::MacSuperChangedPosition()
                {
                        {
                                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 } ;

-                               InvalRect( &inval ) ;
+                               InvalWindowRect( rootwindow , &inval ) ;

                        }
                        }

-               UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
+                       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 } ;
                        {
                                Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;

-                               InvalRect( &inval ) ;
+                               InvalWindowRect( rootwindow , &inval ) ;

                        }
                }
                if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
                        }
                }
                if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )


@@ -365,12 +407,11 @@ void wxControl::MacSuperEnabled( bool enabled )
                }
        }
        wxWindow::MacSuperEnabled( enabled ) ;
                }
        }
        wxWindow::MacSuperEnabled( enabled ) ;

-       */
+*/

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

-       /*

        if ( m_macControl )
        {
                if ( !show )
        if ( m_macControl )
        {
                if ( !show )


@@ -379,13 +420,12 @@ void  wxControl::MacSuperShown( bool show )
                }
                else
                {
                }
                else
                {

-                       if ( m_macShown )
+                       if ( m_isShown )

                                ::UMAShowControl( m_macControl ) ;
                }
        }
                
        wxWindow::MacSuperShown( show ) ;
                                ::UMAShowControl( m_macControl ) ;
                }
        }
                
        wxWindow::MacSuperShown( show ) ;

-       */

 }
 
 void  wxControl::DoSetSize(int x, int y,
 }
 
 void  wxControl::DoSetSize(int x, int y,


@@ -407,8 +447,10 @@ void  wxControl::DoSetSize(int x, int y,
        int former_w = m_width ;
        int former_h = m_height ;
        
        int former_w = m_width ;
        int former_h = m_height ;
        

-       int former_mac_x = (**m_macControl).contrlRect.left ;
-       int former_mac_y = (**m_macControl).contrlRect.top ;
+       Rect contrlRect ;               
+       GetControlBounds( m_macControl , &contrlRect ) ; 
+       int former_mac_x = contrlRect.left ;
+       int former_mac_y = contrlRect.top ;

        
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
        
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -419,9 +461,9 @@ void  wxControl::DoSetSize(int x, int y,
   int actualHeight = height;
   int actualX = x;
   int actualY = y;
   int actualHeight = height;
   int actualX = x;
   int actualY = y;

-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

       actualX = currentX;
       actualX = currentX;

-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

       actualY = currentY;
   if (width == -1)
       actualWidth = currentW ;
       actualY = currentY;
   if (width == -1)
       actualWidth = currentW ;


@@ -432,7 +474,8 @@ void  wxControl::DoSetSize(int x, int y,
                return ;
                
        AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
                return ;
                
        AdjustForParentClientOrigin(actualX, actualY, sizeFlags);

-       wxMacDrawingHelper focus( wxFindWinFromMacWindow( GetMacRootWindow() ) ) ;
+       WindowRef macrootwindow = GetMacRootWindow() ;
+       wxMacDrawingHelper focus( wxFindWinFromMacWindow( macrootwindow ) ) ;

 
        int mac_x = actualX ;
        int mac_y = actualY ;
 
        int mac_x = actualX ;
        int mac_y = actualY ;


@@ -442,12 +485,12 @@ void  wxControl::DoSetSize(int x, int 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 } ;

-                       InvalRect( &inval ) ;
+                       InvalWindowRect( macrootwindow, &inval ) ;

                }
                }

-       UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y  + m_macVerticalBorder ) ;
+               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 } ;
                {
                        Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;

-                       InvalRect( &inval ) ;
+                       InvalWindowRect(macrootwindow, &inval ) ;

                }
        }
 
                }
        }
 


@@ -466,15 +509,15 @@ void  wxControl::DoSetSize(int x, int y,
        {
                {
                        Rect inval = { mac_y , mac_x , mac_y + former_h , mac_x + former_w } ;
        {
                {
                        Rect inval = { mac_y , mac_x , mac_y + former_h , mac_x + former_w } ;

-                       InvalRect( &inval ) ;
+                       InvalWindowRect( macrootwindow, &inval ) ;

                }
                m_width = actualWidth ;
                m_height = actualHeight ;
 
                }
                m_width = actualWidth ;
                m_height = actualHeight ;
 

-       UMASizeControl( m_macControl ,  m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;
+               UMASizeControl( m_macControl ,  m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;

                {
                        Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
                {
                        Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;

-                       InvalRect( &inval ) ;
+                       InvalWindowRect( macrootwindow , &inval ) ;

                }
 
                MacRepositionScrollBars() ;
                }
 
                MacRepositionScrollBars() ;


@@ -544,6 +587,47 @@ void wxControl::Refresh(bool eraseBack, const wxRect *rect)
   }
 }
 
   }
 }
 

+void wxControl::MacRedrawControl()
+{
+       if ( m_macControl )
+       {
+               WindowRef window = GetMacRootWindow() ;
+               if ( window )
+               {
+                       wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                       if ( win )
+                       {
+                               wxMacDrawingHelper help( win ) ;
+                               // the mac control manager always assumes to have the origin at 0,0
+                               SetOrigin( 0 , 0 ) ;
+                               
+                               bool                    hasTabBehind = false ;
+                               wxWindow* parent = GetParent() ;
+                               while ( parent )
+                               {
+                                       if( parent->MacGetWindowData() )
+                                       {
+                                               UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+                                               break ;
+                                       }
+                                       
+                                       if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+                                       {
+                                               if ( ((wxControl*)parent)->m_macControl )
+                                                       SetUpControlBackground( ((wxControl*)parent)->m_macControl , -1 , true ) ;
+                                               break ;
+                                       }
+                                       
+                                       parent = parent->GetParent() ;
+                               } 
+                               
+                               UMADrawControl( m_macControl ) ;
+                               UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+                       }
+               }
+       }
+}
+

 void wxControl::OnPaint(wxPaintEvent& event)
 {
        if ( m_macControl )
 void wxControl::OnPaint(wxPaintEvent& event)
 {
        if ( m_macControl )


@@ -555,6 +639,7 @@ void wxControl::OnPaint(wxPaintEvent& event)
                        if ( win )
                        {
                                wxMacDrawingHelper help( win ) ;
                        if ( win )
                        {
                                wxMacDrawingHelper help( win ) ;

+                               // the mac control manager always assumes to have the origin at 0,0

                                SetOrigin( 0 , 0 ) ;
                                
                                bool                    hasTabBehind = false ;
                                SetOrigin( 0 , 0 ) ;
                                
                                bool                    hasTabBehind = false ;


@@ -587,6 +672,14 @@ void wxControl::OnPaint(wxPaintEvent& event)
                // wxWindow::OnPaint( event ) ;
        }
 }
                // wxWindow::OnPaint( 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.
+}
+

 
 void  wxControl::OnKeyDown( wxKeyEvent &event ) 
 {
 
 void  wxControl::OnKeyDown( wxKeyEvent &event ) 
 {


@@ -610,7 +703,7 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
                return ;
        }
                
                return ;
        }
                

-       if (event.GetEventType() == wxEVT_LEFT_DOWN )
+       if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )

        {
                        
                int x = event.m_x ;
        {
                        
                int x = event.m_x ;