projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Brian Victor's Patch & Cleanups
[wxWidgets.git]
/
src
/
motif
/
toolbar.cpp
diff --git
a/src/motif/toolbar.cpp
b/src/motif/toolbar.cpp
index 6bdc23d9cd9e37c9a4fccf7ccf0d0a9b6a8f4cb0..4078d2eefef9a8410bc2266d6636ee343f7360ca 100644
(file)
--- a/
src/motif/toolbar.cpp
+++ b/
src/motif/toolbar.cpp
@@
-17,7
+17,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "toolbar.h"
#endif
#pragma implementation "toolbar.h"
#endif
@@
-53,7
+53,7
@@
// ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
// ----------------------------------------------------------------------------
#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wx
ToolBarBase
)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wx
Control
)
#endif
// ----------------------------------------------------------------------------
#endif
// ----------------------------------------------------------------------------
@@
-281,7
+281,7
@@
bool wxToolBar::Realize()
Pixmap pixmap, insensPixmap;
wxBitmap bmp, insensBmp;
Pixmap pixmap, insensPixmap;
wxBitmap bmp, insensBmp;
- wxToolBarToolsList::
Node *
node = m_tools.GetFirst();
+ wxToolBarToolsList::
compatibility_iterator
node = m_tools.GetFirst();
while ( node )
{
wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
while ( node )
{
wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
@@
-507,7
+507,7
@@
bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
int packing = GetToolPacking();
int offset = 0;
int packing = GetToolPacking();
int offset = 0;
- for( wxToolBarToolsList::
Node *
node = m_tools.GetFirst();
+ for( wxToolBarToolsList::
compatibility_iterator
node = m_tools.GetFirst();
node; node = node->GetNext() )
{
wxToolBarTool *t = (wxToolBarTool*)node->GetData();
node; node = node->GetNext() )
{
wxToolBarTool *t = (wxToolBarTool*)node->GetData();
@@
-644,7
+644,7
@@
void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags)
wxToolBarToolBase *wxToolBar::FindToolByWidget(WXWidget w) const
{
wxToolBarToolBase *wxToolBar::FindToolByWidget(WXWidget w) const
{
- wxToolBarToolsList::
Node*
node = m_tools.GetFirst();
+ wxToolBarToolsList::
compatibility_iterator
node = m_tools.GetFirst();
while ( node )
{
wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
while ( node )
{
wxToolBarTool *tool = (wxToolBarTool *)node->GetData();