projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. registry files corresponding to the recent registry.h changes
[wxWidgets.git]
/
include
/
wx
/
toolbar.h
diff --git
a/include/wx/toolbar.h
b/include/wx/toolbar.h
index 4b5c73acfbab9ddad3f6b356637a11db24e4d80f..86d2444de77bffaf664ec84e8f2c2312605e470c 100644
(file)
--- a/
include/wx/toolbar.h
+++ b/
include/wx/toolbar.h
@@
-6,15
+6,21
@@
#if defined(__WXMSW__) && defined(__WIN95__)
# include "wx/msw/tbar95.h"
# define wxToolBar wxToolBar95
#if defined(__WXMSW__) && defined(__WIN95__)
# include "wx/msw/tbar95.h"
# define wxToolBar wxToolBar95
-# define
classwxToolBar
classwxToolBar95
+# define
sm_classwxToolBar sm_
classwxToolBar95
#elif defined(__WXMSW__)
# include "wx/msw/tbarmsw.h"
# define wxToolBar wxToolBarMSW
#elif defined(__WXMSW__)
# include "wx/msw/tbarmsw.h"
# define wxToolBar wxToolBarMSW
-# define classwxToolBar classwxToolBarMSW
+# define sm_classwxToolBar sm_classwxToolBarMSW
+#elif defined(__WXMOTIF__)
+# include "wx/motif/toolbar.h"
#elif defined(__WXGTK__)
# include "wx/gtk/tbargtk.h"
#elif defined(__WXQT__)
# include "wx/qt/tbarqt.h"
#elif defined(__WXGTK__)
# include "wx/gtk/tbargtk.h"
#elif defined(__WXQT__)
# include "wx/qt/tbarqt.h"
+#elif defined(__WXMAC__)
+# include "wx/mac/toolbar.h"
+#elif defined(__WXSTUBS__)
+# include "wx/stubs/toolbar.h"
#endif
#endif
#endif
#endif