Corrections in light of recent toolbar and other changes

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

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index d1f8f4bf7997f4aabc820eea92d281e13aa8ef52..640747f84a72647242917b6f9891d6d5d95c8ce2 100644 (file)
--- 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);
 
                       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
     // 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 8cd0fbe281b0ece16e7df2364842401eb6ba13ed..d662578090cd44373d2e0356c3c90019370bc91f 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -796,7 +796,9 @@ wxApp::wxApp()
   m_topWindow = NULL;
   wxTheApp = this;
 
   m_topWindow = NULL;
   wxTheApp = this;
 

-  m_wantDebugOutput = TRUE ;
+#if WXWIN_COMPATIBILITY_2_2
+  m_wantDebugOutput = TRUE;
+#endif

 
   argc = 0;
   argv = NULL;
 
   argc = 0;
   argv = NULL;

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 8cd0fbe281b0ece16e7df2364842401eb6ba13ed..d662578090cd44373d2e0356c3c90019370bc91f 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -796,7 +796,9 @@ wxApp::wxApp()
   m_topWindow = NULL;
   wxTheApp = this;
 
   m_topWindow = NULL;
   wxTheApp = this;
 

-  m_wantDebugOutput = TRUE ;
+#if WXWIN_COMPATIBILITY_2_2
+  m_wantDebugOutput = TRUE;
+#endif

 
   argc = 0;
   argv = NULL;
 
   argc = 0;
   argv = NULL;

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index c7dd11d1956600413792b491c32095c004fed488..1b7a1d62537e76b55786382f041cdb94e1cbc8f2 100644 (file)
--- 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();
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

         
         if(  !tool->IsSeparator()  )
         {
         
         if(  !tool->IsSeparator()  )
         {


@@ -210,7 +210,7 @@ bool wxToolBar::Realize()
             toolrect.bottom = toolrect.top + toolSize.y ;
             
             ControlButtonContentInfo info ;
             toolrect.bottom = toolrect.top + toolSize.y ;
             
             ControlButtonContentInfo info ;

-            wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ;
+            wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;

             ControlHandle m_macToolHandle ;
             
             SInt16 behaviour = kControlBehaviorOffsetContents ;
             ControlHandle m_macToolHandle ;
             
             SInt16 behaviour = kControlBehaviorOffsetContents ;


@@ -391,7 +391,7 @@ void wxToolBar::MacSuperChangedPosition()
        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();
        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-               wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+               wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

                
                if(  !tool->IsSeparator()  )
                {
                
                if(  !tool->IsSeparator()  )
                {

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index c7dd11d1956600413792b491c32095c004fed488..1b7a1d62537e76b55786382f041cdb94e1cbc8f2 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -200,7 +200,7 @@ bool wxToolBar::Realize()
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

         
         if(  !tool->IsSeparator()  )
         {
         
         if(  !tool->IsSeparator()  )
         {


@@ -210,7 +210,7 @@ bool wxToolBar::Realize()
             toolrect.bottom = toolrect.top + toolSize.y ;
             
             ControlButtonContentInfo info ;
             toolrect.bottom = toolrect.top + toolSize.y ;
             
             ControlButtonContentInfo info ;

-            wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ;
+            wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;

             ControlHandle m_macToolHandle ;
             
             SInt16 behaviour = kControlBehaviorOffsetContents ;
             ControlHandle m_macToolHandle ;
             
             SInt16 behaviour = kControlBehaviorOffsetContents ;


@@ -391,7 +391,7 @@ void wxToolBar::MacSuperChangedPosition()
        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();
        while (node)
        {
                wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-               wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
+               wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

                
                if(  !tool->IsSeparator()  )
                {
                
                if(  !tool->IsSeparator()  )
                {