Review, Carbon Events support

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

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index e2be8c3b920eafc0b66291fb8fa7008865ec1c36..9b86af18d14043aee4f4c95a31563230f71ded70 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -87,7 +87,7 @@ pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCod
 ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
 ControlDefUPP wxMacControlActionUPP = NULL ;
 
 ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
 ControlDefUPP wxMacControlActionUPP = NULL ;
 

-pascal SInt32  wxMacControlDefintion(SInt16 varCode, ControlRef theControl, ControlDefProcMessage message, SInt32 param)
+pascal SInt32  wxMacControlDefinition(SInt16 varCode, ControlRef theControl, ControlDefProcMessage message, SInt32 param)

 {
     
        wxControl*  wx = (wxControl*) wxFindControlFromMacControl( theControl ) ;
 {
     
        wxControl*  wx = (wxControl*) wxFindControlFromMacControl( theControl ) ;


@@ -115,7 +115,17 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa
                        if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
                        {
                                wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
                        if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
                        {
                                wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;

-       //                              SetThemeBackground( iDepth , iIsColor ) ;
+#if TARGET_CARBON
+                                       // under classic this would lead to partial redraws
+                                       RgnHandle clip = NewRgn() ;
+                               int x = 0 , y = 0;
+
+                               wx->MacWindowToRootWindow( &x,&y ) ;
+                               CopyRgn( (RgnHandle) wx->MacGetVisibleRegion(false).GetWXHRGN() , clip ) ;
+                               OffsetRgn( clip , x , y ) ;
+                               SetClip( clip ) ;
+                               DisposeRgn( clip ) ;
+#endif

                                }
                                else
                                {
                                }
                                else
                                {


@@ -295,7 +305,7 @@ wxControl *wxFindControlFromMacControl(ControlHandle inControl )
     wxNode *node = wxWinMacControlList->Find((long)inControl);
     if (!node)
         return NULL;
     wxNode *node = wxWinMacControlList->Find((long)inControl);
     if (!node)
         return NULL;

-    return (wxControl *)node->Data();
+    return (wxControl *)node->GetData();

 }
 
 void wxAssociateControlWithMacControl(ControlHandle inControl, wxControl *control)
 }
 
 void wxAssociateControlWithMacControl(ControlHandle inControl, wxControl *control)


@@ -398,8 +408,12 @@ void wxControl::MacPostControlCreate()
        }
        if ( wxMacControlActionUPP == NULL )
        {
        }
        if ( wxMacControlActionUPP == NULL )
        {

-           wxMacControlActionUPP = NewControlDefUPP( wxMacControlDefintion ) ;
+           wxMacControlActionUPP = NewControlDefUPP( wxMacControlDefinition ) ;

        }
        }

+    // The following block of code is responsible for crashes when switching
+    // back to windows, which can be seen in the dialogs sample.
+    // It is disabled until a proper solution can be found.
+#if 0

 #if TARGET_CARBON
 /*
     only working under classic carbon
 #if TARGET_CARBON
 /*
     only working under classic carbon


@@ -417,6 +431,7 @@ void wxControl::MacPostControlCreate()
       (**cdef).function = (void(*)()) wxMacControlActionUPP;
       (**(ControlHandle)m_macControl).contrlDefProc = (Handle) cdef ;
     }
       (**cdef).function = (void(*)()) wxMacControlActionUPP;
       (**(ControlHandle)m_macControl).contrlDefProc = (Handle) cdef ;
     }

+#endif

 #endif
        SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;
  
 #endif
        SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;
  


@@ -589,6 +604,23 @@ void  wxControl::DoSetSize(int x, int y,
             int sizeFlags )
 {
     wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
             int sizeFlags )
 {
     wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;

+#if 0
+    {
+       Rect meta , control ;
+       GetControlBounds( (ControlHandle) m_macControl , &control ) ;
+       RgnHandle rgn = NewRgn() ;
+       GetControlRegion( (ControlHandle) m_macControl , kControlStructureMetaPart , rgn ) ;
+       GetRegionBounds( rgn , &meta ) ;
+       if ( !EmptyRect( &meta ) )
+       {
+                       wxASSERT( meta.left >= control.left - m_macHorizontalBorder ) ;
+                       wxASSERT( meta.right <= control.right + m_macHorizontalBorder ) ;
+                       wxASSERT( meta.top >= control.top - m_macVerticalBorder ) ;
+                       wxASSERT( meta.bottom <= control.bottom + m_macVerticalBorder ) ;
+               }
+       DisposeRgn( rgn ) ;
+    }
+#endif

     return ;
 /*
 
     return ;
 /*