gtk 1.2.8 compilation fix

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

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 56654a1af61f09775494a23db3f187caaf7b6dbe..e4bd0aff79ff5484358c1a55fa5c1f4925745315 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -19,16 +19,83 @@
 
 #include "wx/toolbar.h"
 
 
 #include "wx/toolbar.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 END_EVENT_TABLE()

-#endif

 
 #include <wx/mac/uma.h>
 
 
 #include <wx/mac/uma.h>
 

-wxToolBar::wxToolBar()
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxToolBarTool : public wxToolBarToolBase
+{
+public:
+    wxToolBarTool(wxToolBar *tbar,
+                  int id,
+                  const wxBitmap& bitmap1,
+                  const wxBitmap& bitmap2,
+                  bool toggle,
+                  wxObject *clientData,
+                  const wxString& shortHelpString,
+                  const wxString& longHelpString)
+        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
+                            clientData, shortHelpString, longHelpString)
+    {
+        m_nSepCount = 0;
+        m_index = 0 ;
+    }
+
+    wxToolBarTool(wxToolBar *tbar, wxControl *control)
+        : wxToolBarToolBase(tbar, control)
+    {
+        m_nSepCount = 1;
+        m_index = 0 ;
+    }
+
+    // set/get the number of separators which we use to cover the space used by
+    // a control in the toolbar
+    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
+    size_t GetSeparatorsCount() const { return m_nSepCount; }
+
+    int                m_index ;
+private:
+    size_t m_nSepCount;
+};
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+                                         const wxBitmap& bitmap1,
+                                         const wxBitmap& bitmap2,
+                                         bool toggle,
+                                         wxObject *clientData,
+                                         const wxString& shortHelpString,
+                                         const wxString& longHelpString)
+{
+    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
+                             clientData, shortHelpString, longHelpString);
+}
+
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+{
+    return new wxToolBarTool(this, control);
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar construction
+// ----------------------------------------------------------------------------
+
+void wxToolBar::Init()

 {
   m_maxWidth = -1;
   m_maxHeight = -1;
 {
   m_maxWidth = -1;
   m_maxHeight = -1;


@@ -137,7 +204,7 @@ PicHandle MakePictWhite(GWorldPtr wp)
 const short kwxMacToolBarTopMargin = 2 ;
 const short kwxMacToolBarLeftMargin = 2 ;
 
 const short kwxMacToolBarTopMargin = 2 ;
 const short kwxMacToolBarLeftMargin = 2 ;
 

-bool wxToolBar::CreateTools()
+bool wxToolBar::Realize()

 {
   if (m_tools.Number() == 0)
       return FALSE;
 {
   if (m_tools.Number() == 0)
       return FALSE;


@@ -157,9 +224,9 @@ bool wxToolBar::CreateTools()
        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();
        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();

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

                
                

-               if( tool->m_toolStyle != wxTOOL_STYLE_SEPARATOR )
+               if( !tool->IsSeparator() )

                {
                        Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ;
                        toolrect.right = toolrect.left + toolSize.x ;
                {
                        Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ;
                        toolrect.right = toolrect.left + toolSize.x ;


@@ -178,10 +245,14 @@ bool wxToolBar::CreateTools()
                        
                        ControlHandle m_macToolHandle ;
                                
                        
                        ControlHandle m_macToolHandle ;
                                

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

                        if ( icon )
                        {
                                m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
                        if ( icon )
                        {
                                m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 

-                                       kControlBehaviorOffsetContents + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
+                                       behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;

                                ControlButtonContentInfo info ;
                                
                                info.contentType = kControlContentPictHandle ;
                                ControlButtonContentInfo info ;
                                
                                info.contentType = kControlContentPictHandle ;


@@ -192,7 +263,7 @@ bool wxToolBar::CreateTools()
                        else
                        {
                                                m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
                        else
                        {
                                                m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 

-                                               kControlBehaviorOffsetContents  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
+                                               behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;

                        }
                        m_macToolHandles.Add( m_macToolHandle ) ;
                        UMASetControlFontStyle( m_macToolHandle , &controlstyle ) ;
                        }
                        m_macToolHandles.Add( m_macToolHandle ) ;
                        UMASetControlFontStyle( m_macToolHandle , &controlstyle ) ;


@@ -237,11 +308,6 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
     m_defaultWidth = size.x; m_defaultHeight = size.y;
 }
 
     m_defaultWidth = size.x; m_defaultHeight = size.y;
 }
 

-wxSize wxToolBar::GetMaxSize() const
-{
-    return wxSize(m_maxWidth, m_maxHeight);
-}
-

 // The button size is bigger than the bitmap size
 wxSize wxToolBar::GetToolSize() const
 {
 // The button size is bigger than the bitmap size
 wxSize wxToolBar::GetToolSize() const
 {


@@ -255,73 +321,86 @@ void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpar
        {
                if ( m_macToolHandles[index] == (void*) control )
                {
        {
                if ( m_macToolHandles[index] == (void*) control )
                {

-                       OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_toggleState ) ;
+                       OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->IsToggled() ) ;

                }
        }
 }
 
                }
        }
 }
 

-void wxToolBar::EnableTool(int toolIndex, bool enable)
+void wxToolBar::SetRows(int nRows)

 {
 {

-    wxNode *node = m_tools.Find((long)toolIndex);
-    if (node)
+    if ( nRows == m_maxRows )

     {
     {

-        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-        tool->m_enabled = enable;
-        // TODO enable button
+        // avoid resizing the frame uselessly
+        return;

     }
     }

+
+    m_maxRows = nRows;

 }
 
 }
 

-void wxToolBar::ToggleTool(int toolIndex, bool toggle)
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const

 {
 {

-    wxNode *node = m_tools.Find((long)toolIndex);
-    if (node)
-    {
-        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-        if (tool->m_isToggle)
-        {
-            tool->m_toggleState = toggle;
-            // TODO: set toggle state
-        }
-    }
+    MacClientToRootWindow( &x , &y ) ;
+    Point pt = { x ,y } ;
+
+       int index = 0 ;
+       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+       {
+               if ( PtInRect( pt , &(**(ControlHandle)(m_macToolHandles[index])).contrlRect) )
+               {
+                       return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
+               }
+       }
+
+    return (wxToolBarToolBase *)NULL;

 }
 
 }
 

-void wxToolBar::ClearTools()
+void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)

 {
 {

-    // TODO
-    wxToolBarBase::ClearTools();
+        wxToolBarTool *tool = (wxToolBarTool *)t;
+        ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+               if ( UMAHasAppearance() )
+               {
+                       if ( enable )
+                               ::ActivateControl( control ) ;
+                       else
+                               ::DeactivateControl( control ) ;
+               }
+               else
+               {
+                       if ( enable )
+                               ::HiliteControl( control , 0 ) ;
+                       else
+                               ::HiliteControl( control , 255 ) ;
+               }

 }
 
 }
 

-// If pushedBitmap is NULL, a reversed version of bitmap is
-// created and used as the pushed/toggled image.
-// If toggle is TRUE, the button toggles between the two states.
-
-wxToolBarTool *wxToolBar::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
-             bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
+void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)

 {
 {

-  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2);
-  tool->m_clientData = clientData;
-
-  if (xPos > -1)
-    tool->m_x = xPos;
-  else
-    tool->m_x = m_xMargin;
-
-  if (yPos > -1)
-    tool->m_y = yPos;
-  else
-    tool->m_y = m_yMargin;
-
-  tool->SetSize(GetToolSize().x, GetToolSize().y);
+       wxToolBarTool *tool = (wxToolBarTool *)t;
+        
+       ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
+               ::SetControlValue( control , toggle ) ;
+}

 
 

-  if ((tool->m_x + bitmap.GetWidth() + m_xMargin) > m_maxWidth)
-    m_maxWidth = (tool->m_x + tool->GetWidth() + m_xMargin);
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
+                             wxToolBarToolBase *tool)
+{
+    // nothing special to do here - we really create the toolbar buttons in
+    // Realize() later
+    tool->Attach(this);

 
 

-  if ((tool->m_y + bitmap.GetHeight() + m_yMargin) > m_maxHeight)
-    m_maxHeight = (tool->m_y + tool->GetHeight() + m_yMargin);
+    return TRUE;
+}

 
 

-  m_tools.Append((long)index, tool);
-  return tool;
+void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
+{
+       wxToolBarTool *tool = (wxToolBarTool *)t;
+       // TODO: set toggle state

 }
 
 }
 

+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+{
+               return TRUE ;
+}

 #endif // wxUSE_TOOLBAR
 
 #endif // wxUSE_TOOLBAR