wxMac Unicode support

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 9e6e9197912634743096391ba829f5f1ca5fb7c9..e12f3f63da10ce989c4c76d65e1840f158e0a0a0 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/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,7 +36,6 @@ 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
     EVT_PAINT( wxControl::OnPaint ) 
 END_EVENT_TABLE()
 #endif


@@ -87,47 +86,57 @@ 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 ) ;
-       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 ;
+    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 )
 {
 }
 
 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() ) ;
-       //                              SetThemeBackground( iDepth , iIsColor ) ;
-                               }
-                               else
-                               {
-                                       status = paramErr ;
-                               }
-                       }
-                       break ;
-               default :
-                       status = paramErr ;
-                       break ;
-       }
-       return status ;
+    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()
 }
  
 wxControl::wxControl()


@@ -295,7 +304,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)


@@ -347,19 +356,7 @@ 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()


@@ -392,14 +389,18 @@ void wxControl::MacPostControlCreate()
     m_macControlIsShown  = true ;
 
     wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
     m_macControlIsShown  = true ;
 
     wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;

-       if ( wxMacSetupControlBackgroundUPP == NULL )
-       {
-               wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
-       }
-       if ( wxMacControlActionUPP == NULL )
-       {
-           wxMacControlActionUPP = NewControlDefUPP( wxMacControlDefintion ) ;
-       }
+    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
 #if TARGET_CARBON
 /*
     only working under classic carbon


@@ -413,31 +414,35 @@ void wxControl::MacPostControlCreate()
     cdef = (cdefHandle) NewHandle( sizeof(cdefRec) ) ;
     if (  (**(ControlHandle)m_macControl).contrlDefProc != NULL )
     {
     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 ;
+        (**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) {
+#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);
+    
+    UMAShowControl( (ControlHandle) m_macControl ) ;
+    
+    SetCursor( *wxSTANDARD_CURSOR ) ;
+    
+    Refresh() ;

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


@@ -491,7 +496,7 @@ void wxControl::MacAdjustControlRect()
 
             m_height += 2 * m_macVerticalBorder + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
         }
 
             m_height += 2 * m_macVerticalBorder + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
         }

-               MacUpdateDimensions() ;      
+          MacUpdateDimensions() ;      

 //        UMASizeControl( (ControlHandle) m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;
     }
 }
 //        UMASizeControl( (ControlHandle) m_macControl , m_width - 2 * m_macHorizontalBorder, m_height -  2 * m_macVerticalBorder ) ;
     }
 }


@@ -506,19 +511,19 @@ WXWidget wxControl::MacGetContainerForEmbedding()
 
 void wxControl::MacUpdateDimensions() 
 {
 
 void wxControl::MacUpdateDimensions() 
 {

-       // actually in the current systems this should never be possible, but later reparenting
-       // may become a reality
-       
-       if ( (ControlHandle) m_macControl == NULL )
-               return ;
-               
-       if ( GetParent() == NULL )
-               return ;
-               
+    // actually in the current systems this should never be possible, but later reparenting
+    // may become a reality
+    
+    if ( (ControlHandle) m_macControl == NULL )
+        return ;
+        
+    if ( GetParent() == NULL )
+        return ;
+        

     WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
     if ( rootwindow == NULL )
     WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
     if ( rootwindow == NULL )

-       return ;
-       
+        return ;
+        

     Rect oldBounds ;       
     GetControlBounds( (ControlHandle) m_macControl , &oldBounds ) ; 
     
     Rect oldBounds ;       
     GetControlBounds( (ControlHandle) m_macControl , &oldBounds ) ; 
     


@@ -530,23 +535,23 @@ void wxControl::MacUpdateDimensions()
     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 ;
     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 )
-               {
-                       UMAMoveControl( (ControlHandle) m_macControl , new_x , new_y ) ;
-               }
-               if ( doResize )
-               {
-                       UMASizeControl( (ControlHandle) m_macControl , new_width , new_height ) ;
-               }
-       }
+    if ( doMove || doResize )
+    {
+        InvalWindowRect( rootwindow, &oldBounds ) ;
+        if ( doMove )
+        {
+            UMAMoveControl( (ControlHandle) m_macControl , new_x , new_y ) ;
+        }
+        if ( doResize )
+        {
+            UMASizeControl( (ControlHandle) m_macControl , new_width , new_height ) ;
+        }
+    }

 }
 
 void wxControl::MacSuperChangedPosition() 
 {
 }
 
 void wxControl::MacSuperChangedPosition() 
 {

-       MacUpdateDimensions() ;
+     MacUpdateDimensions() ;

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


@@ -556,7 +561,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 )
     {


@@ -586,6 +591,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 ;
 /*
 


@@ -755,7 +777,7 @@ 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) ;


@@ -785,12 +807,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 ;


@@ -798,6 +832,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 ) 


@@ -819,7 +854,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 ;


@@ -840,20 +874,7 @@ 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 ) )
             {
             control = (ControlHandle) m_macControl ;
             if ( control && ::IsControlActive( control ) )
             {


@@ -870,15 +891,18 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
             }
         }
     }
             }
         }
     }

+    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 )