A few tweaks and cleanups

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

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index e42c5827ef73f332b0d59ee68f8bf1f0a3fee289..2bc339b0136583f4dea899a8037b66476d625bd9 100644 (file)
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -16,7 +16,10 @@
 #pragma interface "toolbar.h"
 #endif
 
 #pragma interface "toolbar.h"
 #endif
 

+#if wxUSE_TOOLBAR
+

 #include "wx/tbarbase.h"
 #include "wx/tbarbase.h"

+#include "wx/dynarray.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 


@@ -28,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();


@@ -42,36 +47,51 @@ 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 Layout() {}
-
-  // The post-tool-addition call. TODO: do here whatever's
-  // necessary for completing the toolbar construction.
-  bool Realize() { return CreateTools(); };

 
 

+       virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
+       virtual wxString MacGetToolTipString( wxPoint &where ) ;
+       void OnPaint(wxPaintEvent& event) ;
+       void OnMouse(wxMouseEvent& event) ;
+       virtual void MacSuperChangedPosition() ;

 protected:
 protected:

-
-DECLARE_EVENT_TABLE()
+    // 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 wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
+                                          wxObject *clientData,
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+
+       wxArrayPtrVoid  m_macToolHandles ;
+
+       DECLARE_EVENT_TABLE()

 };
 
 };
 

+#endif // wxUSE_TOOLBAR
+

 #endif
     // _WX_TOOLBAR_H_
 #endif
     // _WX_TOOLBAR_H_