using Large System font for Buttons needs more space

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

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index cc93410764b4515916c2c0267e74ced50e9b622e..ae57f23ab07e48b09f2b08a4ec810d27902d15a5 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.cpp
 // Purpose:     wxControl class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.cpp
 // Purpose:     wxControl class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -36,16 +36,39 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
     EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 

-    EVT_CHAR( wxControl::OnKeyDown ) 

     EVT_PAINT( wxControl::OnPaint ) 
 END_EVENT_TABLE()
 #endif
 
 #include "wx/mac/uma.h"
     EVT_PAINT( wxControl::OnPaint ) 
 END_EVENT_TABLE()
 #endif
 
 #include "wx/mac/uma.h"

+#include "wx/mac/private.h"

 
 // Item members
 
 
 // Item members
 

+
+#if PRAGMA_STRUCT_ALIGN
+    #pragma options align=mac68k
+#elif PRAGMA_STRUCT_PACKPUSH
+    #pragma pack(push, 2)
+#elif PRAGMA_STRUCT_PACK
+    #pragma pack(2)
+#endif
+
+typedef struct {
+ unsigned short instruction;
+ void (*function)();
+} cdefRec, *cdefPtr, **cdefHandle;
+
+#if PRAGMA_STRUCT_ALIGN
+    #pragma options align=reset
+#elif PRAGMA_STRUCT_PACKPUSH
+    #pragma pack(pop)
+#elif PRAGMA_STRUCT_PACK
+    #pragma pack()
+#endif
+

 ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
 ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;

+wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;

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


@@ -55,21 +78,75 @@ pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCod
         wxControl*  wx = (wxControl*) GetControlReference( control ) ;
         if ( wx )
         {
         wxControl*  wx = (wxControl*) GetControlReference( control ) ;
         if ( wx )
         {

-            wx->MacHandleControlClick( control , partCode ) ;
+            wx->MacHandleControlClick( control , partCode , true /* stillDown */ ) ;

         }
     }
 }
 
         }
     }
 }
 

+ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
+ControlDefUPP wxMacControlActionUPP = NULL ;
+
+pascal SInt32  wxMacControlDefinition(SInt16 varCode, ControlRef theControl, ControlDefProcMessage message, SInt32 param)
+{
+    
+    wxControl*  wx = (wxControl*) wxFindControlFromMacControl( theControl ) ;
+    if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
+    {
+        if( message == drawCntl )
+        {
+            wxMacWindowClipper clip( wx ) ;
+            return InvokeControlDefUPP( varCode , theControl , message , param , (ControlDefUPP) wx->MacGetControlAction() ) ;
+        }
+        else
+            return InvokeControlDefUPP( varCode , theControl , message , param , (ControlDefUPP) wx->MacGetControlAction() ) ;
+    }
+    return  NULL ;
+}
+
+pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor )
+{
+    OSStatus status = noErr ;
+    switch( iMessage )
+    {
+        case kControlMsgSetUpBackground :
+            {
+                wxControl*  wx = (wxControl*) GetControlReference( iControl ) ;
+                if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
+                {
+                    wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
+#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
+                {
+                    status = paramErr ;
+                }
+            }
+            break ;
+        default :
+            status = paramErr ;
+            break ;
+    }
+    return status ;
+}
+ 

 wxControl::wxControl()
 {
     m_macControl = NULL ;
 wxControl::wxControl()
 {
     m_macControl = NULL ;

+    m_macControlAction = NULL ;

     m_macHorizontalBorder = 0 ; // additional pixels around the real control
     m_macVerticalBorder = 0 ;
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
     m_macHorizontalBorder = 0 ; // additional pixels around the real control
     m_macVerticalBorder = 0 ;
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;

-#if WXWIN_COMPATIBILITY
-  m_callback = 0;
-#endif // WXWIN_COMPATIBILITY

 
     if ( wxMacLiveScrollbarActionUPP == NULL )
     {
 
     if ( wxMacLiveScrollbarActionUPP == NULL )
     {


@@ -90,7 +167,13 @@ bool wxControl::Create(wxWindow *parent, wxWindowID id,
     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 ;

+    

     bool rval = wxWindow::Create(parent, id, pos, size, style, name);
     bool rval = wxWindow::Create(parent, id, pos, size, style, name);

+    if ( parent )
+    {
+        m_backgroundColour = parent->GetBackgroundColour() ;
+        m_foregroundColour = parent->GetForegroundColour() ;
+    }

     if (rval) {
 #if wxUSE_VALIDATORS
         SetValidator(validator);
     if (rval) {
 #if wxUSE_VALIDATORS
         SetValidator(validator);


@@ -102,6 +185,7 @@ bool wxControl::Create(wxWindow *parent, wxWindowID id,
 wxControl::~wxControl()
 {
     m_isBeingDeleted = TRUE;
 wxControl::~wxControl()
 {
     m_isBeingDeleted = TRUE;

+    wxRemoveMacControlAssociation( this ) ;

     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.
     wxWindow *parent = GetParent() ;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.
     wxWindow *parent = GetParent() ;


@@ -119,31 +203,20 @@ wxControl::~wxControl()
 
 void wxControl::SetLabel(const wxString& title)
 {
 
 void wxControl::SetLabel(const wxString& title)
 {

-    m_label = title ;
+    m_label = wxStripMenuCodes(title) ;

 
 

-    if ( (ControlHandle) m_macControl )
+    if ( m_macControl )

     {
     {

-        Str255 maclabel ;
-        wxString label ;
-    
-        if( wxApp::s_macDefaultEncodingIsPC )
-            label = wxMacMakeMacStringFromPC( title ) ;
-        else
-            label = title ;
-        
-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) maclabel , label ) ;
-#else
-        strcpy( (char *) maclabel , label ) ;
-        c2pstr( (char *) maclabel ) ;
-#endif
-        ::SetControlTitle( (ControlHandle) m_macControl , maclabel ) ;
+               UMASetControlTitle( (ControlHandle) m_macControl , m_label , m_font.GetEncoding() ) ;

     }
     Refresh() ;
 }
 
 wxSize wxControl::DoGetBestSize() const
 {
     }
     Refresh() ;
 }
 
 wxSize wxControl::DoGetBestSize() const
 {

+    if ( (ControlHandle) m_macControl == NULL )
+        return wxWindow::DoGetBestSize() ;
+        

     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     short   baselineoffset ;
     int bestWidth, bestHeight ;
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     short   baselineoffset ;
     int bestWidth, bestHeight ;


@@ -165,18 +238,7 @@ wxSize wxControl::DoGetBestSize() const
         }
     }
 
         }
     }
 

-    if ( IsKindOf( CLASSINFO( wxButton ) ) )
-    {
-        bestWidth = m_label.Length() * 8 + 12 ;
-        if ( bestWidth < 70 )
-          bestWidth = 70 ;
-    }
-    else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
-    {
-        bestWidth = m_label.Length() * 8 ;
-    }
-    else
-        bestWidth = bestsize.right - bestsize.left ;
+    bestWidth = bestsize.right - bestsize.left ;

         
     bestWidth += 2 * m_macHorizontalBorder ;
 
         
     bestWidth += 2 * m_macHorizontalBorder ;
 


@@ -192,22 +254,10 @@ wxSize wxControl::DoGetBestSize() const
 
 bool wxControl::ProcessCommand (wxCommandEvent & event)
 {
 
 bool wxControl::ProcessCommand (wxCommandEvent & event)
 {

-  // Tries:
-  // 1) A callback function (to become obsolete)
-  // 2) OnCommand, starting at this window and working up parent hierarchy
-  // 3) OnCommand then calls ProcessEvent to search the event tables.
-#if WXWIN_COMPATIBILITY
-    if ( m_callback )
-    {
-        (void)(*m_callback)(this, event);
-
-        return TRUE;
-    }
-    else
-#endif // WXWIN_COMPATIBILITY
-    {
-      return GetEventHandler()->ProcessEvent(event);
-    }
+    // Tries:
+    // 1) OnCommand, starting at this window and working up parent hierarchy
+    // 2) OnCommand then calls ProcessEvent to search the event tables.
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 // ------------------------
 }
 
 // ------------------------


@@ -217,14 +267,14 @@ 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)
 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing
 }
 
 void wxAssociateControlWithMacControl(ControlHandle inControl, wxControl *control)
 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing

-    wxCHECK_RET( inControl != (ControlHandle) NULL, "attempt to add a NULL WindowRef to window list" );
+    wxCHECK_RET( inControl != (ControlHandle) NULL, wxT("attempt to add a NULL WindowRef to window list") );

 
     if ( !wxWinMacControlList->Find((long)inControl) )
         wxWinMacControlList->Append((long)inControl, control);
 
     if ( !wxWinMacControlList->Find((long)inControl) )
         wxWinMacControlList->Append((long)inControl, control);


@@ -232,7 +282,8 @@ void wxAssociateControlWithMacControl(ControlHandle inControl, wxControl *contro
 
 void wxRemoveMacControlAssociation(wxControl *control)
 {
 
 void wxRemoveMacControlAssociation(wxControl *control)
 {

-    wxWinMacControlList->DeleteObject(control);
+    if ( wxWinMacControlList )
+        wxWinMacControlList->DeleteObject(control);

 }
 
 void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , 
 }
 
 void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , 


@@ -242,23 +293,8 @@ void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString l
              const wxString& name , WXRECTPTR outBounds , unsigned char* maclabel ) 
 {
     m_label = label ;
              const wxString& name , WXRECTPTR outBounds , unsigned char* maclabel ) 
 {
     m_label = label ;

-  SetName(name);
-  if ( &validator )
-    SetValidator(validator);
-
-  m_windowStyle = style;
-  parent->AddChild(this);
-
-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
-
-  if (id == -1)
-      m_windowId = NewControlId();
-  else
-      m_windowId = id;
-
-   // These sizes will be adjusted in MacPostControlCreate

 
 

+    // These sizes will be adjusted in MacPostControlCreate

     m_width = size.x ;
     m_height = size.y ;
     m_x = pos.x ;
     m_width = size.x ;
     m_height = size.y ;
     m_x = pos.x ;


@@ -269,30 +305,18 @@ void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString l
     ((Rect*)outBounds)->bottom = 0;
     ((Rect*)outBounds)->right = 0;
 
     ((Rect*)outBounds)->bottom = 0;
     ((Rect*)outBounds)->right = 0;
 

-    char c_text[255];
-    strcpy( c_text , label ) ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        wxMacConvertFromPCForControls( c_text ) ;
-    }
-
-#if TARGET_CARBON
-    c2pstrcpy( (StringPtr) maclabel , c_text ) ;
-#else
-    strcpy( (char *) maclabel , c_text ) ;
-    c2pstr( (char *) maclabel ) ;
-#endif
+    wxMacStringToPascal( wxStripMenuCodes(label) , maclabel ) ;

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

-    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;

     
     if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
     {
         // no font
     }
     
     if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
     {
         // no font
     }

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

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


@@ -304,36 +328,79 @@ void wxControl::MacPostControlCreate()
     {
         ControlFontStyleRec     controlstyle ;
         controlstyle.flags = kControlUseFontMask ;
     {
         ControlFontStyleRec     controlstyle ;
         controlstyle.flags = kControlUseFontMask ;

-        controlstyle.font = kControlFontSmallSystemFont ;
+        
+        if (IsKindOf( CLASSINFO( wxButton ) ) )
+            controlstyle.font = kControlFontBigSystemFont ; // eventually kControlFontBigSystemFont ;
+        else
+            controlstyle.font = kControlFontSmallSystemFont ;

         
         ::SetControlFontStyle( (ControlHandle) m_macControl , &controlstyle ) ;
     }
     ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
     ::EmbedControl( (ControlHandle) m_macControl , container ) ;
         
         ::SetControlFontStyle( (ControlHandle) m_macControl , &controlstyle ) ;
     }
     ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
     ::EmbedControl( (ControlHandle) m_macControl , container ) ;

-    m_macControlIsShown  = true ;
+    m_macControlIsShown  = MacIsReallyShown() ;

 
     wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
 
     wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;

+    if ( wxMacSetupControlBackgroundUPP == NULL )
+    {
+        wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
+    }
+    if ( wxMacControlActionUPP == NULL )
+    {
+        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
+    m_macControlAction = *(**(ControlHandle)m_macControl).contrlDefProc ;
+    (**(ControlHandle)m_macControl).contrlDefProc = (Handle) &wxMacControlActionUPP ;
+*/
+#else
+    m_macControlAction = *(**(ControlHandle)m_macControl).contrlDefProc ;

 
 

- 
-     // Adjust the controls size and position
-     wxPoint pos(m_x, m_y);
-     wxSize best_size( DoGetBestSize() );
-     wxSize new_size( m_width, m_height );
- 
-     m_x = m_y = m_width = m_height = -1;  // Forces SetSize to move/size the control
- 
-     if (new_size.x == -1) {
+    cdefHandle cdef ;
+    cdef = (cdefHandle) NewHandle( sizeof(cdefRec) ) ;
+    if (  (**(ControlHandle)m_macControl).contrlDefProc != NULL )
+    {
+        (**cdef).instruction = 0x4EF9;  /* JMP instruction */
+        (**cdef).function = (void(*)()) wxMacControlActionUPP;
+        (**(ControlHandle)m_macControl).contrlDefProc = (Handle) cdef ;
+    }
+#endif
+#endif
+    SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;
+    
+    // Adjust the controls size and position
+    wxPoint pos(m_x, m_y);
+    wxSize best_size( DoGetBestSize() );
+    wxSize new_size( m_width, m_height );
+    
+    m_x = m_y = m_width = m_height = -1;  // Forces SetSize to move/size the control
+    
+    if (new_size.x == -1) {

         new_size.x = best_size.x;
         new_size.x = best_size.x;

-     }
-     if (new_size.y == -1) {
-         new_size.y = best_size.y;
-     }
- 
-     SetSize(pos.x, pos.y, new_size.x, new_size.y);
- 
-     UMAShowControl( (ControlHandle) m_macControl ) ;
-     Refresh() ;
+    }
+    if (new_size.y == -1) {
+        new_size.y = best_size.y;
+    }
+    
+    SetSize(pos.x, pos.y, new_size.x, new_size.y);
+    
+#if wxUSE_UNICODE
+    UMASetControlTitle( (ControlHandle) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
+#endif
+
+    if ( m_macControlIsShown )
+        UMAShowControl( (ControlHandle) m_macControl ) ;
+    
+    SetCursor( *wxSTANDARD_CURSOR ) ;
+    
+    Refresh() ;

 }
 
 void wxControl::MacAdjustControlRect() 
 }
 
 void wxControl::MacAdjustControlRect() 


@@ -366,7 +433,7 @@ void wxControl::MacAdjustControlRect()
         {
             if ( IsKindOf( CLASSINFO( wxButton ) ) )
             {
         {
             if ( IsKindOf( CLASSINFO( wxButton ) ) )
             {

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

                 if ( m_width < 70 )
                   m_width = 70 ;
             }
                 if ( m_width < 70 )
                   m_width = 70 ;
             }


@@ -377,7 +444,7 @@ void wxControl::MacAdjustControlRect()
             else
                 m_width = bestsize.right - bestsize.left ;
             
             else
                 m_width = bestsize.right - bestsize.left ;
             

-            m_width += 2 * m_macHorizontalBorder ;
+            m_width += 2 * m_macHorizontalBorder + MacGetLeftBorderSize() + MacGetRightBorderSize() ;

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


@@ -385,10 +452,9 @@ void wxControl::MacAdjustControlRect()
             if ( m_height < 10 )
                 m_height = 13 ;
 
             if ( m_height < 10 )
                 m_height = 13 ;
 

-            m_height += 2 * m_macVerticalBorder;
+            m_height += 2 * m_macVerticalBorder + MacGetTopBorderSize() + MacGetBottomBorderSize() ;

         }
         }

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

     }
 }
 
     }
 }
 


@@ -400,35 +466,49 @@ WXWidget wxControl::MacGetContainerForEmbedding()
     return wxWindow::MacGetContainerForEmbedding() ;
 }
 
     return wxWindow::MacGetContainerForEmbedding() ;
 }
 

-void wxControl::MacSuperChangedPosition() 
+void wxControl::MacUpdateDimensions() 

 {
 {

-    if ( (ControlHandle) m_macControl )
-    {
-        Rect contrlRect ;       
-        GetControlBounds( (ControlHandle) 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()->MacWindowToRootWindow( & mac_x , & mac_y ) ;
+    // actually in the current systems this should never be possible, but later reparenting
+    // may become a reality
+    
+    if ( (ControlHandle) m_macControl == NULL )
+        return ;

         
         

-        WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
-
-        if ( mac_x + m_macHorizontalBorder != former_mac_x || 
-            mac_y + m_macVerticalBorder != former_mac_y )
+    if ( GetParent() == NULL )
+        return ;
+        
+    WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
+    if ( rootwindow == NULL )
+        return ;
+        
+    Rect oldBounds ;       
+    GetControlBounds( (ControlHandle) m_macControl , &oldBounds ) ; 
+    
+    int new_x = m_x + MacGetLeftBorderSize() + m_macHorizontalBorder ;
+    int new_y = m_y + MacGetTopBorderSize() + m_macVerticalBorder ;
+    int new_width = m_width - MacGetLeftBorderSize() - MacGetRightBorderSize() - 2 * m_macHorizontalBorder ;
+    int new_height = m_height - MacGetTopBorderSize() - MacGetBottomBorderSize() - 2 * m_macVerticalBorder ;
+    
+    GetParent()->MacWindowToRootWindow( & new_x , & new_y ) ;
+    bool doMove = new_x != oldBounds.left || new_y != oldBounds.top ;
+    bool doResize =  ( oldBounds.right - oldBounds.left ) != new_width || (oldBounds.bottom - oldBounds.top ) != new_height ;
+    if ( doMove || doResize )
+    {
+        InvalWindowRect( rootwindow, &oldBounds ) ;
+        if ( doMove )

         {
         {

-            {
-                Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
-                InvalWindowRect( rootwindow , &inval ) ;
-            }
-            UMAMoveControl( (ControlHandle) 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 ) ;
-            }
+            UMAMoveControl( (ControlHandle) m_macControl , new_x , new_y ) ;
+        }
+        if ( doResize )
+        {
+            UMASizeControl( (ControlHandle) m_macControl , new_width , new_height ) ;

         }
     }
         }
     }

+}

 
 

+void wxControl::MacSuperChangedPosition() 
+{
+     MacUpdateDimensions() ;

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


@@ -438,7 +518,7 @@ void wxControl::MacSuperEnabled( bool enabled )
     wxWindow::MacSuperEnabled( enabled ) ;
 }
 
     wxWindow::MacSuperEnabled( enabled ) ;
 }
 

-void  wxControl::MacSuperShown( bool show ) 
+void wxControl::MacSuperShown( bool show ) 

 {
     if ( (ControlHandle) m_macControl )
     {
 {
     if ( (ControlHandle) m_macControl )
     {


@@ -467,120 +547,25 @@ void  wxControl::DoSetSize(int x, int y,
             int width, int height,
             int sizeFlags )
 {
             int width, int height,
             int sizeFlags )
 {

-    if ( (ControlHandle) m_macControl == NULL )
+    wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
+#if 0

     {
     {

-        wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
-        return ;
+        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 ) ;

     }
     }

-
-     Rect oldbounds;
-     int new_x, new_y, new_width, new_height;
-     int mac_x, mac_y;
- 
-     new_x = m_x;
-     new_y = m_y;
-     new_width  = m_width;
-     new_height = m_height;
- 
-     if (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)
-     {
-         new_x      = x;
-         new_y      = y;
-         new_width  = width;
-         new_height = height;
-     }
-     else
-     {
-         if (x != -1)      new_x      = x;
-         if (y != -1)      new_y      = y;
-         if (width != -1)  new_width  = width;
-         if (height != -1) new_height = height;
-     }
- 
-     if(sizeFlags & wxSIZE_AUTO)
-     {
-         wxSize size = GetBestSize();
-         if (sizeFlags & wxSIZE_AUTO_WIDTH)
-         {
-             if (width == -1)   new_width = size.x;
-         }
-         if (sizeFlags & wxSIZE_AUTO_HEIGHT)
-         {
-             if (height == -1)   new_height = size.y;
-         }
-     }
-     AdjustForParentClientOrigin(new_x, new_y, sizeFlags);
- 
-     mac_x = new_x;
-     mac_y = new_y;
-     if(GetParent()) {
-         GetParent()->MacWindowToRootWindow(&mac_x, &mac_y);
-     }
-     GetControlBounds( (ControlHandle) m_macControl, &oldbounds);
-     oldbounds.right = oldbounds.left + m_width;
-     oldbounds.bottom = oldbounds.top + m_height;
- 
-     bool doMove = false;
-     bool doResize = false;
- 
-     if ( mac_x != (oldbounds.left - m_macHorizontalBorder) ||
-          mac_y != (oldbounds.top - m_macVerticalBorder) )
-     {
-         doMove = true ;
-     }
-     if ( new_width != oldbounds.right - oldbounds.left - 2 * m_macHorizontalBorder ||
-          new_height != oldbounds.bottom - oldbounds.top - 2 * m_macVerticalBorder)
-     {
-         doResize = true ;
-     }
- 
-     if ( doMove || doResize )
-     {
-         Refresh() ;
-     
-         // Ensure resize is within constraints
-         if ((m_minWidth != -1) && (new_width < m_minWidth)) {
-             new_width = m_minWidth;
-         }
-         if ((m_minHeight != -1) && (new_height < m_minHeight)) {
-             new_height = m_minHeight;
-         }
-         if ((m_maxWidth != -1) && (new_width > m_maxWidth)) {
-             new_width = m_maxWidth;
-         }
-         if ((m_maxHeight != -1) && (new_height > m_maxHeight)) {
-             new_height = m_maxHeight;
-         }
- 
-         if ( doMove )
-         {
-             m_x = new_x;
-             m_y = new_y;
- 
-             UMAMoveControl( (ControlHandle) 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) ;
-         }
-         if ( doResize )
-         {
-             m_width = new_width;
-             m_height = new_height;
- 
-             UMASizeControl( (ControlHandle) m_macControl,
-                             m_width - 2 * m_macHorizontalBorder,
-                             m_height -  2 * m_macVerticalBorder ) ;
- 
- 
-             wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
-             event.SetEventObject(this);
-             GetEventHandler()->ProcessEvent(event);
-         }
- 
-          Refresh() ;
-     }
+#endif
+    return ;

 }
 
 bool  wxControl::Show(bool show) 
 }
 
 bool  wxControl::Show(bool show) 


@@ -632,17 +617,11 @@ void wxControl::Refresh(bool eraseBack, const wxRect *rect)
 
 void wxControl::MacRedrawControl()
 {
 
 void wxControl::MacRedrawControl()
 {

-    if ( (ControlHandle) m_macControl && MacGetRootWindow() )
+    if ( (ControlHandle) m_macControl && MacGetRootWindow() && m_macControlIsShown )

     {
         wxClientDC dc(this) ;
         wxMacPortSetter helper(&dc) ;
     {
         wxClientDC dc(this) ;
         wxMacPortSetter helper(&dc) ;

-        
-        // the controls sometimes draw outside their boundaries, this
-        // should be resolved differently but is not trivial (e.g. drop shadows)
-        // since adding them to the border would yield in enormous gaps between
-        // the controls
-        Rect r = { 0 , 0 , 32000 , 32000 } ;
-        ClipRect( &r ) ;
+        wxMacWindowClipper clipper(this) ;

         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         UMADrawControl( (ControlHandle) m_macControl ) ;
     }
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         UMADrawControl( (ControlHandle) m_macControl ) ;
     }


@@ -654,13 +633,7 @@ void wxControl::OnPaint(wxPaintEvent& event)
     {
         wxPaintDC dc(this) ;
         wxMacPortSetter helper(&dc) ;
     {
         wxPaintDC dc(this) ;
         wxMacPortSetter helper(&dc) ;

-        // the controls sometimes draw outside their boundaries, this
-        // should be resolved differently but is not trivial (e.g. drop shadows)
-        // since adding them to the border would yield in enormous gaps between
-        // the controls
-        Rect r = { 0 , 0 , 32000 , 32000 } ;
-        ClipRect( &r ) ;
-
+        wxMacWindowClipper clipper(this) ;

         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         UMADrawControl( (ControlHandle) m_macControl ) ;
     }
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         UMADrawControl( (ControlHandle) m_macControl ) ;
     }


@@ -674,12 +647,24 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
     wxWindow::OnEraseBackground( event ) ; 
 }
 
     wxWindow::OnEraseBackground( event ) ; 
 }
 

-

 void  wxControl::OnKeyDown( wxKeyEvent &event ) 
 {
     if ( (ControlHandle) m_macControl == NULL )
         return ;
     
 void  wxControl::OnKeyDown( wxKeyEvent &event ) 
 {
     if ( (ControlHandle) m_macControl == NULL )
         return ;
     

+#if TARGET_CARBON
+
+    char charCode ;
+    UInt32 keyCode ;    
+    UInt32 modifiers ;
+
+    GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
+    GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL,  sizeof(UInt32), NULL, &keyCode );
+       GetEventParameter((EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
+
+    ::HandleControlKey( (ControlHandle) m_macControl , keyCode , charCode , modifiers ) ;
+    
+#else

     EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
     short keycode ;
     short keychar ;
     EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
     short keycode ;
     short keychar ;


@@ -687,6 +672,7 @@ void  wxControl::OnKeyDown( wxKeyEvent &event )
     keycode = short(ev->message & keyCodeMask) >> 8 ;
 
     ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
     keycode = short(ev->message & keyCodeMask) >> 8 ;
 
     ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;

+#endif

 }
 
 void  wxControl::OnMouseEvent( wxMouseEvent &event ) 
 }
 
 void  wxControl::OnMouseEvent( wxMouseEvent &event ) 


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

-        WindowRef   window = (WindowRef) MacGetRootWindow() ;

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


@@ -729,49 +714,37 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
     
         if ( event.m_metaDown )
             modifiers |= cmdKey ;
     
         if ( event.m_metaDown )
             modifiers |= cmdKey ;

-/*
-#if TARGET_CARBON
-        control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
-#else
-        controlpart = FindControl( localwhere , window , &control ) ;
-#endif
-*/

         {
         {

-        /*
-            if ( AcceptsFocus() && FindFocus() != this )
-            {
-                SetFocus() ;
-            }
-        */

             control = (ControlHandle) m_macControl ;
             if ( control && ::IsControlActive( control ) )
             {
                 {
                     controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
                     wxTheApp->s_lastMouseDown = 0 ;
             control = (ControlHandle) m_macControl ;
             if ( control && ::IsControlActive( control ) )
             {
                 {
                     controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
                     wxTheApp->s_lastMouseDown = 0 ;

-                    if ( control && controlpart != kControlNoPart && 
-                        ! IsKindOf( CLASSINFO( wxScrollBar ) ) 
-                    ) // otherwise we will get the event twice for scrollbar
+                    if ( control && controlpart != kControlNoPart ) 

                     {
                     {

-                        MacHandleControlClick( control , controlpart ) ;
+                        MacHandleControlClick( control , controlpart , false /* mouse not down anymore */ ) ;

                     }
                 }
             }
         }
     }
                     }
                 }
             }
         }
     }

+    else
+    {
+       event.Skip() ;
+    }

 }
 
 bool wxControl::MacCanFocus() const
 {
 }
 
 bool wxControl::MacCanFocus() const
 {

-        { if ( (ControlHandle) m_macControl == NULL ) 
-                return true ; 
-            else
-            return false ; 
-        }
+    if ( (ControlHandle) m_macControl == NULL ) 
+        return true ; 
+    else
+        return false ; 

 }
 
 }
 

-void wxControl::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxControl::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) 

 {
 {

-    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;

 }
 
 }