wxMenu::callback stuff taken inside WXWIN_COMPATIBILITY_2 (everybody should

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

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index e42c5827ef73f332b0d59ee68f8bf1f0a3fee289..6fe126b788ba707766c3d95e3f28248c6ef16400 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;
 


@@ -62,16 +65,19 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
   // Add all the buttons
   virtual bool CreateTools();
 
   // Add all the buttons
   virtual bool CreateTools();

-  virtual void Layout() {}
+       virtual void LayoutButtons() {}

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

 protected:
 protected:

+       wxArrayPtrVoid  m_macToolHandles ;

 
 DECLARE_EVENT_TABLE()
 };
 
 
 DECLARE_EVENT_TABLE()
 };
 

+#endif // wxUSE_TOOLBAR
+

 #endif
     // _WX_TOOLBAR_H_
 #endif
     // _WX_TOOLBAR_H_