Prevent wxMac from creating an epmpty bitmap in a toolbar

    if all we want is a separator.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 51ba976d420f25e714509e9fd2680f0f0b18c353..d8bdac1326f60f9cf121423a9a3a12299b82ebf1 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -173,7 +173,9 @@ wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
         : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
                             clientData, shortHelp, longHelp)
 {
-    Init() ;
+    Init();
+    
+    if (id == wxID_SEPARATOR) return;
     
     WindowRef window = (WindowRef) tbar->MacGetRootWindow() ;    
     wxSize toolSize = tbar->GetToolSize() ;    

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 51ba976d420f25e714509e9fd2680f0f0b18c353..d8bdac1326f60f9cf121423a9a3a12299b82ebf1 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -173,7 +173,9 @@ wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
         : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
                             clientData, shortHelp, longHelp)
 {
-    Init() ;
+    Init();
+    
+    if (id == wxID_SEPARATOR) return;
     
     WindowRef window = (WindowRef) tbar->MacGetRootWindow() ;    
     wxSize toolSize = tbar->GetToolSize() ;