diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index d1f8f4bf79..640747f84a 100644
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -171,7 +171,7 @@ public:
const wxString& deftopic = wxEmptyString,
const wxString& path = wxEmptyString);
- bool wxHtmlHelpData::AlreadyHasBook(wxHtmlBookRecord * bookr) ;
+ bool AlreadyHasBook(wxHtmlBookRecord * bookr) ;
// Some accessing stuff:
// returns URL of page on basis of (file)name
diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 8cd0fbe281..d662578090 100644
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -796,7 +796,9 @@ wxApp::wxApp()
m_topWindow = NULL;
wxTheApp = this;
- m_wantDebugOutput = TRUE ;
+#if WXWIN_COMPATIBILITY_2_2
+ m_wantDebugOutput = TRUE;
+#endif
argc = 0;
argv = NULL;
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 8cd0fbe281..d662578090 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -796,7 +796,9 @@ wxApp::wxApp()
m_topWindow = NULL;
wxTheApp = this;
- m_wantDebugOutput = TRUE ;
+#if WXWIN_COMPATIBILITY_2_2
+ m_wantDebugOutput = TRUE;
+#endif
argc = 0;
argv = NULL;
diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index c7dd11d195..1b7a1d6253 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -200,7 +200,7 @@ bool wxToolBar::Realize()
while (node)
{
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
if( !tool->IsSeparator() )
{
@@ -210,7 +210,7 @@ bool wxToolBar::Realize()
toolrect.bottom = toolrect.top + toolSize.y ;
ControlButtonContentInfo info ;
- wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ;
+ wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;
ControlHandle m_macToolHandle ;
SInt16 behaviour = kControlBehaviorOffsetContents ;
@@ -391,7 +391,7 @@ void wxToolBar::MacSuperChangedPosition()
while (node)
{
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
if( !tool->IsSeparator() )
{
diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index c7dd11d195..1b7a1d6253 100644
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -200,7 +200,7 @@ bool wxToolBar::Realize()
while (node)
{
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
if( !tool->IsSeparator() )
{
@@ -210,7 +210,7 @@ bool wxToolBar::Realize()
toolrect.bottom = toolrect.top + toolSize.y ;
ControlButtonContentInfo info ;
- wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ;
+ wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;
ControlHandle m_macToolHandle ;
SInt16 behaviour = kControlBehaviorOffsetContents ;
@@ -391,7 +391,7 @@ void wxToolBar::MacSuperChangedPosition()
while (node)
{
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+ wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
if( !tool->IsSeparator() )
{