use WX_DEFINE_ARRAY_INT for an array of ints (bug 1536482)

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

diff --git a/src/mac/classic/toolbar.cpp b/src/mac/classic/toolbar.cpp
index 16f857539294e95b3979c3df360fc9939bcc3024..15b9379cbad40d81e1b3625ba32244620a68710f 100644 (file)
--- a/src/mac/classic/toolbar.cpp
+++ b/src/mac/classic/toolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        toolbar.cpp
+// Name:        src/mac/classic/toolbar.cpp

 // Purpose:     wxToolBar
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxToolBar
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,20 +9,24 @@
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/wx.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_TOOLBAR
 
 #include "wx/toolbar.h"
 
 #if wxUSE_TOOLBAR
 
 #include "wx/toolbar.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+

 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-#include "wx/bitmap.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 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()
 
 #include "wx/mac/uma.h"
 END_EVENT_TABLE()
 
 #include "wx/mac/uma.h"


@@ -43,19 +47,19 @@ public:
                   wxObject *clientData,
                   const wxString& shortHelp,
                   const wxString& longHelp) ;
                   wxObject *clientData,
                   const wxString& shortHelp,
                   const wxString& longHelp) ;

-                  
+

     wxToolBarTool(wxToolBar *tbar, wxControl *control)
         : wxToolBarToolBase(tbar, control)
     {
         Init() ;
     }
     wxToolBarTool(wxToolBar *tbar, wxControl *control)
         : wxToolBarToolBase(tbar, control)
     {
         Init() ;
     }

-    
-    ~wxToolBarTool()
+
+    virtual ~wxToolBarTool()

     {
         if ( m_controlHandle )
             DisposeControl( m_controlHandle ) ;
     }
     {
         if ( m_controlHandle )
             DisposeControl( m_controlHandle ) ;
     }

-    
+

     ControlHandle   GetControlHandle() { return m_controlHandle ; }
     void SetControlHandle( ControlHandle handle ) { m_controlHandle = handle ; }
 
     ControlHandle   GetControlHandle() { return m_controlHandle ; }
     void SetControlHandle( ControlHandle handle ) { m_controlHandle = handle ; }
 


@@ -82,9 +86,9 @@ public:
     wxPoint GetPosition() const
     {
         return wxPoint(m_x, m_y);
     wxPoint GetPosition() const
     {
         return wxPoint(m_x, m_y);

-    }    
+    }

 private :
 private :

-    void Init() 
+    void Init()

     {
         m_controlHandle = NULL ;
     }
     {
         m_controlHandle = NULL ;
     }


@@ -119,18 +123,18 @@ void wxToolBarTool::SetPosition(const wxPoint& position)
     {
         int x , y ;
         x = y = 0 ;
     {
         int x , y ;
         x = y = 0 ;

-        WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetRootWindow() ;    
+        WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetRootWindow() ;

         GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
         int mac_x = x + position.x ;
         int mac_y = y + position.y ;
         GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
         int mac_x = x + position.x ;
         int mac_y = y + position.y ;

-        

 
 

-        Rect contrlRect ;       
-        GetControlBounds( m_controlHandle , &contrlRect ) ; 
+
+        Rect contrlRect ;
+        GetControlBounds( m_controlHandle , &contrlRect ) ;

         int former_mac_x = contrlRect.left ;
         int former_mac_y = contrlRect.top ;
         wxSize sz = GetToolBar()->GetToolSize() ;
         int former_mac_x = contrlRect.left ;
         int former_mac_y = contrlRect.top ;
         wxSize sz = GetToolBar()->GetToolSize() ;

-        
+

         if ( mac_x != former_mac_x || mac_y != former_mac_y )
         {
             {
         if ( mac_x != former_mac_x || mac_y != former_mac_y )
         {
             {


@@ -156,42 +160,42 @@ const short kwxMacToolBarTopMargin = 2 ;
 const short kwxMacToolBarLeftMargin = 2 ;
 
 wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
 const short kwxMacToolBarLeftMargin = 2 ;
 
 wxToolBarTool::wxToolBarTool(wxToolBar *tbar,

-  int id,
-  const wxString& label,
-  const wxBitmap& bmpNormal,
-  const wxBitmap& bmpDisabled,
-  wxItemKind kind,
-  wxObject *clientData,
-  const wxString& shortHelp,
-  const wxString& longHelp)
+                             int id,
+                             const wxString& label,
+                             const wxBitmap& bmpNormal,
+                             const wxBitmap& bmpDisabled,
+                             wxItemKind kind,
+                             wxObject *clientData,
+                             const wxString& shortHelp,
+                             const wxString& longHelp)

         : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
                             clientData, shortHelp, longHelp)
 {
     Init();
         : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
                             clientData, shortHelp, longHelp)
 {
     Init();

-    
+

     if (id == wxID_SEPARATOR) return;
     if (id == wxID_SEPARATOR) return;

-    
-    WindowRef window = (WindowRef) tbar->MacGetRootWindow() ;    
-    wxSize toolSize = tbar->GetToolSize() ;    
+
+    WindowRef window = (WindowRef) tbar->MacGetRootWindow() ;
+    wxSize toolSize = tbar->GetToolSize() ;

     Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ;
     Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ;

-    
+

     ControlButtonContentInfo info ;
     wxMacCreateBitmapButton( &info , GetNormalBitmap() ) ;
     ControlButtonContentInfo info ;
     wxMacCreateBitmapButton( &info , GetNormalBitmap() ) ;

-    
+

     SInt16 behaviour = kControlBehaviorOffsetContents ;
     if ( CanBeToggled() )
         behaviour += kControlBehaviorToggles ;
     SInt16 behaviour = kControlBehaviorOffsetContents ;
     if ( CanBeToggled() )
         behaviour += kControlBehaviorToggles ;

-    
-    if ( info.contentType != kControlNoContent ) 
+
+    if ( info.contentType != kControlNoContent )

     {
     {

-        m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , 
+        m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,

                                         behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                                         behaviour + info.contentType , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;

-        
+

         ::SetControlData( m_controlHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
     }
     else
     {
         ::SetControlData( m_controlHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
     }
     else
     {

-        m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 , 
+        m_controlHandle = ::NewControl( window , &toolrect , "\p" , false , 0 ,

                                         behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
     }
     UMAShowControl( m_controlHandle ) ;
                                         behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
     }
     UMAShowControl( m_controlHandle ) ;


@@ -207,7 +211,7 @@ wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
     {
         ::SetControl32BitValue( m_controlHandle , 0 ) ;
     }
     {
         ::SetControl32BitValue( m_controlHandle , 0 ) ;
     }

-    
+

     ControlHandle container = (ControlHandle) tbar->MacGetContainerForEmbedding() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
     ::EmbedControl( m_controlHandle , container ) ;
     ControlHandle container = (ControlHandle) tbar->MacGetContainerForEmbedding() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
     ::EmbedControl( m_controlHandle , container ) ;


@@ -242,12 +246,12 @@ void wxToolBar::Init()
 
 bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 
 bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)

-{  
+{

     int x = pos.x;
     int y = pos.y;
     int width = size.x;
     int height = size.y;
     int x = pos.x;
     int y = pos.y;
     int width = size.x;
     int height = size.y;

-    
+

     if (width <= 0)
         width = 100;
     if (height <= 0)
     if (width <= 0)
         width = 100;
     if (height <= 0)


@@ -256,20 +260,20 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
         x = 0;
     if (y < 0)
         y = 0;
         x = 0;
     if (y < 0)
         y = 0;

-    
+

     SetName(name);
     SetName(name);

-    
+

     m_windowStyle = style;
     parent->AddChild(this);
     m_windowStyle = style;
     parent->AddChild(this);

-    
+

     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;

-    
-    if (id == -1)
+
+    if (id == wxID_ANY)

         m_windowId = NewControlId();
     else
         m_windowId = id;
         m_windowId = NewControlId();
     else
         m_windowId = id;

-    
+

     {
         m_width = size.x ;
         m_height = size.y ;
     {
         m_width = size.x ;
         m_height = size.y ;


@@ -279,12 +283,12 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
         m_x = x ;
         m_y = y ;
     }
         m_x = x ;
         m_y = y ;
     }

-    
-    return TRUE;
+
+    return true;

 }
 
 wxToolBar::~wxToolBar()
 }
 
 wxToolBar::~wxToolBar()

-{    
+{

     // we must refresh the frame size when the toolbar is deleted but the frame
     // is not - otherwise toolbar leaves a hole in the place it used to occupy
 }
     // we must refresh the frame size when the toolbar is deleted but the frame
     // is not - otherwise toolbar leaves a hole in the place it used to occupy
 }


@@ -292,17 +296,17 @@ wxToolBar::~wxToolBar()
 bool wxToolBar::Realize()
 {
     if (m_tools.GetCount() == 0)
 bool wxToolBar::Realize()
 {
     if (m_tools.GetCount() == 0)

-        return FALSE;
+        return false;

 
     int x = m_xMargin + kwxMacToolBarLeftMargin ;
     int y = m_yMargin + kwxMacToolBarTopMargin ;
 
     int tw, th;
     GetSize(& tw, & th);
 
     int x = m_xMargin + kwxMacToolBarLeftMargin ;
     int y = m_yMargin + kwxMacToolBarTopMargin ;
 
     int tw, th;
     GetSize(& tw, & th);

-    
+

     int maxWidth = 0 ;
     int maxHeight = 0 ;
     int maxWidth = 0 ;
     int maxHeight = 0 ;

-    
+

     int maxToolWidth = 0;
     int maxToolHeight = 0;
 
     int maxToolWidth = 0;
     int maxToolHeight = 0;
 


@@ -326,15 +330,15 @@ bool wxToolBar::Realize()
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
         wxSize cursize = tool->GetSize() ;
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
         wxSize cursize = tool->GetSize() ;

-        
+

         // for the moment we just do a single row/column alignement
         if ( x + cursize.x > maxWidth )
             maxWidth = x + cursize.x ;
         if ( y + cursize.y > maxHeight )
             maxHeight = y + cursize.y ;
         // for the moment we just do a single row/column alignement
         if ( x + cursize.x > maxWidth )
             maxWidth = x + cursize.x ;
         if ( y + cursize.y > maxHeight )
             maxHeight = y + cursize.y ;

-            
+

         tool->SetPosition( wxPoint( x , y ) ) ;
         tool->SetPosition( wxPoint( x , y ) ) ;

-        
+

         if ( GetWindowStyleFlag() & wxTB_VERTICAL )
         {
             y += cursize.y ;
         if ( GetWindowStyleFlag() & wxTB_VERTICAL )
         {
             y += cursize.y ;


@@ -346,7 +350,7 @@ bool wxToolBar::Realize()
 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }

-    
+

     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     {
         if ( m_maxRows == 0 )
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     {
         if ( m_maxRows == 0 )


@@ -354,7 +358,7 @@ bool wxToolBar::Realize()
             // if not set yet, only one row
             SetRows(1);
         }
             // if not set yet, only one row
             SetRows(1);
         }

-        maxWidth = tw ; 
+        maxWidth = tw ;

         maxHeight += m_yMargin + kwxMacToolBarTopMargin;
         m_maxHeight = maxHeight ;
     }
         maxHeight += m_yMargin + kwxMacToolBarTopMargin;
         m_maxHeight = maxHeight ;
     }


@@ -369,11 +373,11 @@ bool wxToolBar::Realize()
         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
         m_maxWidth = maxWidth ;
     }
         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
         m_maxWidth = maxWidth ;
     }

-    
+

     SetSize(maxWidth, maxHeight);
     InvalidateBestSize();
     SetSize(maxWidth, maxHeight);
     InvalidateBestSize();

-    
-    return TRUE;
+
+    return true;

 }
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 }
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)


@@ -387,15 +391,15 @@ wxSize wxToolBar::GetToolSize() const
     return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);
 }
 
     return wxSize(m_defaultWidth + 4, m_defaultHeight + 4);
 }
 

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

 {
     wxToolBarToolsList::Node *node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
 {
     wxToolBarToolsList::Node *node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {

-        wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ; 
+        wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ;

         if ( tool->IsButton() )
         {
         if ( tool->IsButton() )
         {

-           if( (WXWidget) tool->GetControlHandle() == control ) 
+           if( (WXWidget) tool->GetControlHandle() == control )

            {
                 if ( tool->CanBeToggled() )
                 {
            {
                 if ( tool->CanBeToggled() )
                 {


@@ -419,7 +423,7 @@ void wxToolBar::SetRows(int nRows)
     m_maxRows = nRows;
 }
 
     m_maxRows = nRows;
 }
 

-void wxToolBar::MacSuperChangedPosition() 
+void wxToolBar::MacSuperChangedPosition()

 {
     wxWindow::MacSuperChangedPosition() ;
     Realize() ;
 {
     wxWindow::MacSuperChangedPosition() ;
     Realize() ;


@@ -491,7 +495,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
     tool->Attach(this);
     InvalidateBestSize();
 
     tool->Attach(this);
     InvalidateBestSize();
 

-    return TRUE;
+    return true;

 }
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
 }
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))


@@ -519,7 +523,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
     tool->Detach();
 
     // and finally reposition all the controls after this one
     tool->Detach();
 
     // and finally reposition all the controls after this one

-    
+

     for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
     {
         wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
     for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
     {
         wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();


@@ -535,24 +539,24 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
         }
         tool2->SetPosition( pt ) ;
     }
         }
         tool2->SetPosition( pt ) ;
     }

-    
+

     InvalidateBestSize();
     InvalidateBestSize();

-    return TRUE ;
+    return true ;

 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
     wxPaintDC dc(this) ;
     wxMacPortSetter helper(&dc) ;
 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
     wxPaintDC dc(this) ;
     wxMacPortSetter helper(&dc) ;

-    
-    Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , 
+
+    Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,

         dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
     UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
     {
         wxToolBarToolsList::Node *node;
         for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
         {
         dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
     UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
     {
         wxToolBarToolsList::Node *node;
         for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
         {

-            wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ; 
+            wxToolBarTool* tool = (wxToolBarTool*) node->GetData() ;

             if ( tool->IsButton() )
             {
                UMADrawControl( tool->GetControlHandle() ) ;
             if ( tool->IsButton() )
             {
                UMADrawControl( tool->GetControlHandle() ) ;


@@ -561,41 +565,41 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
     }
 }
 
     }
 }
 

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

-            
+

         int x = event.m_x ;
         int y = event.m_y ;
         int x = event.m_x ;
         int y = event.m_y ;

-        
+

         MacClientToRootWindow( &x , &y ) ;
         MacClientToRootWindow( &x , &y ) ;

-            
+

         ControlHandle   control ;
         Point       localwhere ;
         SInt16      controlpart ;
         WindowRef   window = (WindowRef) MacGetRootWindow() ;
         ControlHandle   control ;
         Point       localwhere ;
         SInt16      controlpart ;
         WindowRef   window = (WindowRef) MacGetRootWindow() ;

-        
+

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

-    
+

         short modifiers = 0;
         short modifiers = 0;

-        
+

         if ( !event.m_leftDown && !event.m_rightDown )
             modifiers  |= btnState ;
         if ( !event.m_leftDown && !event.m_rightDown )
             modifiers  |= btnState ;

-    
+

         if ( event.m_shiftDown )
             modifiers |= shiftKey ;
         if ( event.m_shiftDown )
             modifiers |= shiftKey ;

-            
+

         if ( event.m_controlDown )
             modifiers |= controlKey ;
         if ( event.m_controlDown )
             modifiers |= controlKey ;

-    
+

         if ( event.m_altDown )
             modifiers |= optionKey ;
         if ( event.m_altDown )
             modifiers |= optionKey ;

-    
+

         if ( event.m_metaDown )
             modifiers |= cmdKey ;
         if ( event.m_metaDown )
             modifiers |= cmdKey ;

-    
+

         controlpart = ::FindControl( localwhere , window , &control ) ;
         {
             if ( control && ::IsControlActive( control ) )
         controlpart = ::FindControl( localwhere , window , &control ) ;
         {
             if ( control && ::IsControlActive( control ) )


@@ -614,4 +618,3 @@ void  wxToolBar::OnMouse( wxMouseEvent &event )
 }
 
 #endif // wxUSE_TOOLBAR
 }
 
 #endif // wxUSE_TOOLBAR

-