projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proper UTF32 / 16 conversions added
[wxWidgets.git]
/
src
/
mac
/
carbon
/
toolbar.cpp
diff --git
a/src/mac/carbon/toolbar.cpp
b/src/mac/carbon/toolbar.cpp
index 5820490844cc6987eda4b1c057293692324fd56d..d8bdac1326f60f9cf121423a9a3a12299b82ebf1 100644
(file)
--- a/
src/mac/carbon/toolbar.cpp
+++ b/
src/mac/carbon/toolbar.cpp
@@
-23,7
+23,7
@@
#include "wx/bitmap.h"
#if !USE_SHARED_LIBRARY
#include "wx/bitmap.h"
#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wx
ToolBarBase
)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wx
Control
)
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_MOUSE_EVENTS( wxToolBar::OnMouse )
BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
EVT_MOUSE_EVENTS( wxToolBar::OnMouse )
@@
-173,7
+173,9
@@
wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
: wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
clientData, shortHelp, longHelp)
{
: 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() ;
WindowRef window = (WindowRef) tbar->MacGetRootWindow() ;
wxSize toolSize = tbar->GetToolSize() ;