native window disposal is moved to deferred delete, size of parent taken into account...

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

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 1b7a1d62537e76b55786382f041cdb94e1cbc8f2..77662d2dbed4e3710d93b7d2545e268eff498645 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -41,14 +41,15 @@ class wxToolBarTool : public wxToolBarToolBase
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,

-                  const wxBitmap& bitmap1,
-                  const wxBitmap& bitmap2,
-                  bool toggle,
+                  const wxString& label,
+                  const wxBitmap& bmpNormal,
+                  const wxBitmap& bmpDisabled,
+                  wxItemKind kind,

                   wxObject *clientData,
                   wxObject *clientData,

-                  const wxString& shortHelpString,
-                  const wxString& longHelpString)
-        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
-                            clientData, shortHelpString, longHelpString)
+                  const wxString& shortHelp,
+                  const wxString& longHelp)
+        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+                            clientData, shortHelp, longHelp)

     {
         m_nSepCount = 0;
         m_index = -1 ;
     {
         m_nSepCount = 0;
         m_index = -1 ;


@@ -87,15 +88,16 @@ const short kwxMacToolBarLeftMargin = 2 ;
 
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
 
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,

-                                         const wxBitmap& bitmap1,
-                                         const wxBitmap& bitmap2,
-                                         bool toggle,
+                                         const wxString& label,
+                                         const wxBitmap& bmpNormal,
+                                         const wxBitmap& bmpDisabled,
+                                         wxItemKind kind,

                                          wxObject *clientData,
                                          wxObject *clientData,

-                                         const wxString& shortHelpString,
-                                         const wxString& longHelpString)
+                                         const wxString& shortHelp,
+                                         const wxString& longHelp)

 {
 {

-    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
-                             clientData, shortHelpString, longHelpString);
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);

 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)


@@ -167,9 +169,9 @@ bool wxToolBar::Realize()
         return FALSE;
 
     Point localOrigin ;
         return FALSE;
 
     Point localOrigin ;

-    Rect clipRect ;
+    //    Rect clipRect ;

     WindowRef window = (WindowRef) MacGetRootWindow() ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;

-    wxWindow *win ;
+    //    wxWindow *win ;

     
     int lx , ly ;
     lx = ly = 0 ;
     
     int lx , ly ;
     lx = ly = 0 ;


@@ -358,9 +360,9 @@ void wxToolBar::MacSuperChangedPosition()
   {
 
     Point localOrigin ;
   {
 
     Point localOrigin ;

-    Rect clipRect ;
-    WindowRef window ;
-    wxWindow *win ;
+    //    Rect clipRect ;
+    //    WindowRef window ;
+    //    wxWindow *win ;

     int lx , ly ;
     lx = ly = 0 ;
     MacWindowToRootWindow( &lx , &ly ) ;
     int lx , ly ;
     lx = ly = 0 ;
     MacWindowToRootWindow( &lx , &ly ) ;