Fix/hack 1.

[wxWidgets.git] / include / wx / mac / toolbar.h

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index 6fe126b788ba707766c3d95e3f28248c6ef16400..11a488ca90f5e094c36845ea71cfd3f37bb0c8ea 100644 (file)
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -31,12 +31,14 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
    * Public interface
    */
 
    * Public interface
    */
 

-  wxToolBar();
+   wxToolBar() { Init(); }
+

 
   inline wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr)
   {
 
   inline wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr)
   {

+    Init();

     Create(parent, id, pos, size, style, name);
   }
   ~wxToolBar();
     Create(parent, id, pos, size, style, name);
   }
   ~wxToolBar();


@@ -45,36 +47,46 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr);
 
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr);
 

-  // 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 *AddTool(int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
-               bool toggle = FALSE, long xPos = -1, long yPos = -1, wxObject *clientData = NULL,
-               const wxString& helpString1 = "", const wxString& helpString2 = "");
+    // override/implement base class virtuals
+    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;

 
 

-  // Set default bitmap size
-  void SetToolBitmapSize(const wxSize& size);
-  void EnableTool(int toolIndex, bool enable); // additional drawing on enabling
-  void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
-  void ClearTools();
+    virtual bool Realize();

 
 

-  // The button size is bigger than the bitmap size
-  wxSize GetToolSize() const;
+    virtual void SetToolBitmapSize(const wxSize& size);
+    virtual wxSize GetToolSize() const;

 
 

-  wxSize GetMaxSize() const;
+    virtual void SetRows(int nRows);

 
   // Add all the buttons
 
   // Add all the buttons

-  virtual bool CreateTools();
-       virtual void LayoutButtons() {}

 
 

-  // The post-tool-addition call. TODO: do here whatever's
-  // necessary for completing the toolbar construction.
-  bool Realize() { return CreateTools(); };

        virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
        virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;

+       virtual wxString MacGetToolTipString( wxPoint &where ) ;
+       void OnPaint(wxPaintEvent& event) ;
+       void OnMouse(wxMouseEvent& event) ;

 protected:
 protected:

+    // common part of all ctors
+    void Init();
+
+    // implement base class pure virtuals
+    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
+    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+
+    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
+    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
+    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+
+    virtual wxToolBarToolBase *CreateTool(int id,
+                                          const wxBitmap& bitmap1,
+                                          const wxBitmap& bitmap2,
+                                          bool toggle,
+                                          wxObject *clientData,
+                                          const wxString& shortHelpString,
+                                          const wxString& longHelpString);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+

        wxArrayPtrVoid  m_macToolHandles ;
 
        wxArrayPtrVoid  m_macToolHandles ;
 

-DECLARE_EVENT_TABLE()
+       DECLARE_EVENT_TABLE()

 };
 
 #endif // wxUSE_TOOLBAR
 };
 
 #endif // wxUSE_TOOLBAR