nativedlg and some interface changes.

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

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 417aba00c8685369abc4806fd550d04ee0079f1a..e2be8c3b920eafc0b66291fb8fa7008865ec1c36 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -401,8 +401,11 @@ void wxControl::MacPostControlCreate()
            wxMacControlActionUPP = NewControlDefUPP( wxMacControlDefintion ) ;
        }
 #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 ;
 
@@ -434,6 +437,9 @@ void wxControl::MacPostControlCreate()
      SetSize(pos.x, pos.y, new_size.x, new_size.y);
  
      UMAShowControl( (ControlHandle) m_macControl ) ;
+     
+     SetCursor( *wxSTANDARD_CURSOR ) ;
+     
      Refresh() ;
 }
 
@@ -752,7 +758,7 @@ void wxControl::Refresh(bool eraseBack, const wxRect *rect)
 
 void wxControl::MacRedrawControl()
 {
-    if ( (ControlHandle) m_macControl && MacGetRootWindow() )
+    if ( (ControlHandle) m_macControl && MacGetRootWindow() && m_macControlIsShown )
     {
         wxClientDC dc(this) ;
         wxMacPortSetter helper(&dc) ;
@@ -764,11 +770,6 @@ void wxControl::MacRedrawControl()
 
 void wxControl::OnPaint(wxPaintEvent& event)
 {
-    if ( IsKindOf( CLASSINFO( wxBitmapButton ) ) )
-    {
-        int i ;
-        i = 0 ;
-    }
     if ( (ControlHandle) m_macControl )
     {
         wxPaintDC dc(this) ;
@@ -821,7 +822,6 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
         ControlHandle   control ;
         Point       localwhere ;
         SInt16      controlpart ;
-        WindowRef   window = (WindowRef) MacGetRootWindow() ;
         
         localwhere.h = x ;
         localwhere.v = y ;
@@ -842,20 +842,7 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
     
         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 ) )
             {