test wxExecute() in the sample

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

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index f88f68b24f753f6bbef9ce9dcd71462972c2b411..152e1aaddfce3fdc39a4c8a49ec8554538c67a2f 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -25,8 +25,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)

-       EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
-       EVT_PAINT( wxToolBar::OnPaint ) 
+    EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
+    EVT_PAINT( wxToolBar::OnPaint ) 

 END_EVENT_TABLE()
 #endif
 
 END_EVENT_TABLE()
 #endif
 


@@ -41,14 +41,15 @@ class wxToolBarTool : public wxToolBarToolBase
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,

-                  const wxBitmap& bitmap1,
-                  const wxBitmap& bitmap2,
-                  bool toggle,
+                  const wxString& label,
+                  const wxBitmap& bmpNormal,
+                  const wxBitmap& bmpDisabled,
+                  wxItemKind kind,

                   wxObject *clientData,
                   wxObject *clientData,

-                  const wxString& shortHelpString,
-                  const wxString& longHelpString)
-        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
-                            clientData, shortHelpString, longHelpString)
+                  const wxString& shortHelp,
+                  const wxString& longHelp)
+        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+                            clientData, shortHelp, longHelp)

     {
         m_nSepCount = 0;
         m_index = -1 ;
     {
         m_nSepCount = 0;
         m_index = -1 ;


@@ -66,7 +67,7 @@ public:
     void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
     size_t GetSeparatorsCount() const { return m_nSepCount; }
 
     void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
     size_t GetSeparatorsCount() const { return m_nSepCount; }
 

-    int                m_index ;
+    int     m_index ;

 private:
     size_t m_nSepCount;
 };
 private:
     size_t m_nSepCount;
 };


@@ -87,15 +88,16 @@ const short kwxMacToolBarLeftMargin = 2 ;
 
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
 
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,

-                                         const wxBitmap& bitmap1,
-                                         const wxBitmap& bitmap2,
-                                         bool toggle,
+                                         const wxString& label,
+                                         const wxBitmap& bmpNormal,
+                                         const wxBitmap& bmpDisabled,
+                                         wxItemKind kind,

                                          wxObject *clientData,
                                          wxObject *clientData,

-                                         const wxString& shortHelpString,
-                                         const wxString& longHelpString)
+                                         const wxString& shortHelp,
+                                         const wxString& longHelp)

 {
 {

-    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
-                             clientData, shortHelpString, longHelpString);
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);

 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)


@@ -143,13 +145,13 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
       m_windowId = id;
 
   {
       m_windowId = id;
 
   {

-       m_width = size.x ;
-       m_height = size.y ;
-       int x = pos.x ;
-       int y = pos.y ;
-       AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
-       m_x = x ;
-       m_y = y ;
+    m_width = size.x ;
+    m_height = size.y ;
+    int x = pos.x ;
+    int y = pos.y ;
+    AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
+    m_x = x ;
+    m_y = y ;

   }
   
   return TRUE;
   }
   
   return TRUE;


@@ -168,13 +170,19 @@ bool wxToolBar::Realize()
 
     Point localOrigin ;
     Rect clipRect ;
 
     Point localOrigin ;
     Rect clipRect ;

-    WindowRef window ;
+    WindowRef window = (WindowRef) MacGetRootWindow() ;

     wxWindow *win ;
     
     wxWindow *win ;
     

-    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+    int lx , ly ;
+    lx = ly = 0 ;
+    MacWindowToRootWindow( &lx , &ly ) ;
+    localOrigin.v = ly ;
+    localOrigin.h = lx ;
+    
+//    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;

 
 

-    Rect toolbarrect = { m_y + localOrigin.v , m_x  + localOrigin.h , 
-                         m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
+    Rect toolbarrect = { localOrigin.v ,localOrigin.h , 
+        m_height + localOrigin.v  , m_width + localOrigin.h} ;

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


@@ -194,7 +202,7 @@ bool wxToolBar::Realize()
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

         
         if(  !tool->IsSeparator()  )
         {
         
         if(  !tool->IsSeparator()  )
         {


@@ -204,37 +212,14 @@ bool wxToolBar::Realize()
             toolrect.bottom = toolrect.top + toolSize.y ;
             
             ControlButtonContentInfo info ;
             toolrect.bottom = toolrect.top + toolSize.y ;
             
             ControlButtonContentInfo info ;

-            if ( bmap )
-            {
-                if ( bmap->m_bitmapType == kMacBitmapTypePict )
-                {
-                    info.contentType = kControlContentPictHandle ;
-                    info.u.picture = bmap->m_hPict ;
-                }
-                else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
-                {
-                    if ( tool->GetBitmap1().GetMask() )
-                    {
-                        info.contentType = kControlContentCIconHandle ;
-                        info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , tool->GetBitmap1().GetMask()->GetMaskBitmap() ,
-                                                               8 , 16 ) ;
-                    }
-                    else
-                    {
-                        info.contentType = kControlContentCIconHandle ;
-                        info.u.cIconHandle = wxMacCreateCIcon( bmap->m_hBitmap , NULL ,
-                                                               8 , 16 ) ;
-                    }
-                }
-            }
-            
+            wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;

             ControlHandle m_macToolHandle ;
             
             SInt16 behaviour = kControlBehaviorOffsetContents ;
             if ( tool->CanBeToggled() )
                 behaviour += kControlBehaviorToggles ;
             
             ControlHandle m_macToolHandle ;
             
             SInt16 behaviour = kControlBehaviorOffsetContents ;
             if ( tool->CanBeToggled() )
                 behaviour += kControlBehaviorToggles ;
             

-            if ( info.u.cIconHandle ) // since it is a handle we can use one of them
+            if ( info.contentType != kControlNoContent ) 

             {
                 m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , 
                                                 behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
             {
                 m_macToolHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , 
                                                 behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;


@@ -264,7 +249,7 @@ bool wxToolBar::Realize()
             /*
               ::SetControlFontStyle( m_macToolHandle , &controlstyle ) ;
             */
             /*
               ::SetControlFontStyle( m_macToolHandle , &controlstyle ) ;
             */

-            ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
+            ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;

             wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
             ::EmbedControl( m_macToolHandle , container ) ;
             
             wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
             ::EmbedControl( m_macToolHandle , container ) ;
             


@@ -340,22 +325,22 @@ wxSize wxToolBar::GetToolSize() const
     return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);
 }
 
     return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);
 }
 

-void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 

 {
 {

-       int index = 0 ;
-       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-       {
-               if ( m_macToolHandles[index] == (void*) control )
-               {
-                       wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
-                       if ( tool->CanBeToggled() )
-               {
-                       tool->Toggle( GetControlValue( control ) ) ;
-               }
-                       OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
-                       break ;
-               }
-       }
+    int index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        if ( m_macToolHandles[index] == (void*) control )
+        {
+            wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
+            if ( tool->CanBeToggled() )
+            {
+                tool->Toggle( GetControlValue( (ControlHandle) control ) ) ;
+            }
+            OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
+            break ;
+        }
+    }

 }
 
 void wxToolBar::SetRows(int nRows)
 }
 
 void wxToolBar::SetRows(int nRows)


@@ -374,24 +359,29 @@ void wxToolBar::MacSuperChangedPosition()
   if (m_tools.Number() > 0)
   {
 
   if (m_tools.Number() > 0)
   {
 

-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *win ;
-       
-       GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
+    Point localOrigin ;
+    Rect clipRect ;
+    WindowRef window ;
+    wxWindow *win ;
+    int lx , ly ;
+    lx = ly = 0 ;
+    MacWindowToRootWindow( &lx , &ly ) ;
+    localOrigin.v = ly ;
+    localOrigin.h = lx ;
+    
+//    GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;

 
 

-       Rect toolbarrect = { m_y + localOrigin.v , m_x  + localOrigin.h , 
-               m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
-       ControlFontStyleRec             controlstyle ;
+    Rect toolbarrect = { localOrigin.v ,localOrigin.h , 
+        m_height + localOrigin.v  , m_width + localOrigin.h} ;
+    ControlFontStyleRec     controlstyle ;

 
 

-       controlstyle.flags = kControlUseFontMask ;
-       controlstyle.font = kControlFontSmallSystemFont ;
-       
-       wxNode *node = m_tools.First();
-       int noButtons = 0;
-       int x = 0 ;
-       wxSize toolSize = GetToolSize() ;
+    controlstyle.flags = kControlUseFontMask ;
+    controlstyle.font = kControlFontSmallSystemFont ;
+    
+    wxNode *node = m_tools.First();
+    int noButtons = 0;
+    int x = 0 ;
+    wxSize toolSize = GetToolSize() ;

     int tw, th;
     GetSize(& tw, & th);
     
     int tw, th;
     GetSize(& tw, & th);
     


@@ -399,14 +389,11 @@ void wxToolBar::MacSuperChangedPosition()
     int maxHeight = 0 ;
     int toolcount = 0 ;
     {
     int maxHeight = 0 ;
     int toolcount = 0 ;
     {

-               WindowRef rootwindow = GetMacRootWindow() ;
-               wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-               ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
-               wxMacDrawingHelper focus( wxrootwindow ) ;
+      WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;

        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();
        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-               wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+               wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

                
                if(  !tool->IsSeparator()  )
                {
                
                if(  !tool->IsSeparator()  )
                {


@@ -444,22 +431,15 @@ void wxToolBar::MacSuperChangedPosition()
                else
                {
                 toolcount++ ;
                else
                {
                 toolcount++ ;

-                       x += (int)toolSize.x / 4;
-               }
-           if ( toolbarrect.left + x + m_xMargin  + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
-                       maxWidth = toolbarrect.left + x  + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
-               if (toolbarrect.top + m_yMargin  + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
-                       maxHeight = toolbarrect.top  + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
-
-               node = node->Next();
-       }
-               if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
-               {
-               }
-               else
-               {
-                       ::SetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
-               }
+                x += (int)toolSize.x / 4;
+            }
+            if ( toolbarrect.left + x + m_xMargin  + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
+                maxWidth = toolbarrect.left + x  + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
+            if (toolbarrect.top + m_yMargin  + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
+                maxHeight = toolbarrect.top  + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
+
+            node = node->Next();
+        }

     }
 
      if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     }
 
      if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )


@@ -469,10 +449,10 @@ void wxToolBar::MacSuperChangedPosition()
            // if not set yet, only one row
            SetRows(1);
        }
            // if not set yet, only one row
            SetRows(1);
        }

-       maxWidth = tw ; 
+        maxWidth = tw ; 

        maxHeight += toolSize.y;
        maxHeight += toolSize.y;

-       maxHeight += m_yMargin + kwxMacToolBarTopMargin;
-       m_maxHeight = maxHeight ;
+        maxHeight += m_yMargin + kwxMacToolBarTopMargin;
+        m_maxHeight = maxHeight ;

      }
      else
      {
      }
      else
      {


@@ -483,8 +463,8 @@ void wxToolBar::MacSuperChangedPosition()
        }
        maxHeight = th ;
        maxWidth += toolSize.x;
        }
        maxHeight = th ;
        maxWidth += toolSize.x;

-       maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
-       m_maxWidth = maxWidth ;
+        maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
+        m_maxWidth = maxWidth ;

      }
 
      SetSize(maxWidth, maxHeight);
      }
 
      SetSize(maxWidth, maxHeight);


@@ -498,55 +478,61 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 

-       int index = 0 ;
-       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-       {
-               if ( m_macToolHandles[index] )
-               {
-                       Rect bounds ;
-                       GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
-                       if ( PtInRect( pt , &bounds ) )
-                       {
-                               return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
-                       }
-               }
-       }
+    int index = 0 ;
+    for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+    {
+        if ( m_macToolHandles[index] )
+        {
+            Rect bounds ;
+            GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
+            if ( PtInRect( pt , &bounds ) )
+            {
+                return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+            }
+        }
+    }

 
     return (wxToolBarToolBase *)NULL;
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
 {
 
     return (wxToolBarToolBase *)NULL;
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
 {

-       wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
-       if ( tool )
-       {
-               return tool->GetShortHelp() ;
-       }
-       return "" ;
+    wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
+    if ( tool )
+    {
+        return tool->GetShortHelp() ;
+    }
+    return "" ;

 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {

-        wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-               return ;
-               
-        ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-
-               if ( enable )
-                       UMAActivateControl( control ) ;
-               else
-                       UMADeactivateControl( control ) ;
+    if (!IsShown())
+        return ;
+
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( tool->m_index < 0 )
+        return ;
+           
+    ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+
+    if ( enable )
+        UMAActivateControl( control ) ;
+    else
+        UMADeactivateControl( control ) ;

 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {

-       wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-               return ;
+    if (!IsShown())
+        return ;
+
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( tool->m_index < 0 )
+        return ;

         
         

-       ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-               ::SetControlValue( control , toggle ) ;
+    ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+        ::SetControlValue( control , toggle ) ;

 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),


@@ -567,64 +553,31 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {

-               return TRUE ;
+        return TRUE ;

 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {

-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *win ;
-       
-       GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
-       if ( window && win )
+  wxPaintDC dc(this) ;
+  wxMacPortSetter helper(&dc) ;
+  
+       Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , 
+               dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
+       UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;

        {
        {

-               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 )
+               int index = 0 ;
+               for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )

                {
                {

-                       if( parent->MacGetWindowData() )
-                       {
-                               ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-                               break ;
-                       }
-                       
-                       if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+                       if ( m_macToolHandles[index] )

                        {
                        {

-                               if ( ((wxControl*)parent)->GetMacControl() )
-                                       SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
-                               break ;
-                       }
-                       
-                       parent = parent->GetParent() ;
-               } 
-
-               Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 
-                       m_y  + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
-
-               UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-               {
-                       int index = 0 ;
-                       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-                       {
-                               if ( m_macToolHandles[index] )
-                               {
-                                       UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
-                               }
+                               UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;

                        }
                }
                        }
                }

-               ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;

        }
 }
 
 void  wxToolBar::OnMouse( wxMouseEvent &event ) 
 {
        }
 }
 
 void  wxToolBar::OnMouse( wxMouseEvent &event ) 
 {

-               

        if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
        {
                        
        if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
        {
                        


@@ -637,7 +590,7 @@ void  wxToolBar::OnMouse( wxMouseEvent &event )
                Point           localwhere ;
                GrafPtr         port ;
                SInt16          controlpart ;
                Point           localwhere ;
                GrafPtr         port ;
                SInt16          controlpart ;

-               WindowRef       window = GetMacRootWindow() ;
+               WindowRef       window = (WindowRef) MacGetRootWindow() ;

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