Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrections in light of recent toolbar and other changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-03-07 18:48:03 +00:00
parent cd72551c2b
commit 1b21409b36
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/html/helpdata.h
View File

@@ -171,7 +171,7 @@ public:
const wxString& deftopic = wxEmptyString, const wxString& deftopic = wxEmptyString,
const wxString& path = wxEmptyString); const wxString& path = wxEmptyString);
bool wxHtmlHelpData::AlreadyHasBook(wxHtmlBookRecord * bookr) ; bool AlreadyHasBook(wxHtmlBookRecord * bookr) ;
// Some accessing stuff: // Some accessing stuff:
// returns URL of page on basis of (file)name // returns URL of page on basis of (file)name

4
src/mac/app.cpp
View File

@@ -796,7 +796,9 @@ wxApp::wxApp()
m_topWindow = NULL; m_topWindow = NULL;
wxTheApp = this; wxTheApp = this;
m_wantDebugOutput = TRUE ; #if WXWIN_COMPATIBILITY_2_2
m_wantDebugOutput = TRUE;
#endif
argc = 0; argc = 0;
argv = NULL; argv = NULL;

4
src/mac/carbon/app.cpp
View File

@@ -796,7 +796,9 @@ wxApp::wxApp()
m_topWindow = NULL; m_topWindow = NULL;
wxTheApp = this; wxTheApp = this;
m_wantDebugOutput = TRUE ; #if WXWIN_COMPATIBILITY_2_2
m_wantDebugOutput = TRUE;
#endif
argc = 0; argc = 0;
argv = NULL; argv = NULL;

6
src/mac/carbon/toolbar.cpp
View File

@@ -200,7 +200,7 @@ bool wxToolBar::Realize()
while (node) while (node)
{ {
wxToolBarTool *tool = (wxToolBarTool *)node->Data(); 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 ; toolrect.bottom = toolrect.top + toolSize.y ;
ControlButtonContentInfo info ; ControlButtonContentInfo info ;
wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ; wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;
ControlHandle m_macToolHandle ; ControlHandle m_macToolHandle ;
SInt16 behaviour = kControlBehaviorOffsetContents ; SInt16 behaviour = kControlBehaviorOffsetContents ;
@@ -391,7 +391,7 @@ void wxToolBar::MacSuperChangedPosition()
while (node) while (node)
{ {
wxToolBarTool *tool = (wxToolBarTool *)node->Data(); wxToolBarTool *tool = (wxToolBarTool *)node->Data();
wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ; wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
if( !tool->IsSeparator() ) if( !tool->IsSeparator() )
{ {

6
src/mac/toolbar.cpp
View File

@@ -200,7 +200,7 @@ bool wxToolBar::Realize()
while (node) while (node)
{ {
wxToolBarTool *tool = (wxToolBarTool *)node->Data(); 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 ; toolrect.bottom = toolrect.top + toolSize.y ;
ControlButtonContentInfo info ; ControlButtonContentInfo info ;
wxMacCreateBitmapButton( &info , tool->GetBitmap1() ) ; wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() ) ;
ControlHandle m_macToolHandle ; ControlHandle m_macToolHandle ;
SInt16 behaviour = kControlBehaviorOffsetContents ; SInt16 behaviour = kControlBehaviorOffsetContents ;
@@ -391,7 +391,7 @@ void wxToolBar::MacSuperChangedPosition()
while (node) while (node)
{ {
wxToolBarTool *tool = (wxToolBarTool *)node->Data(); wxToolBarTool *tool = (wxToolBarTool *)node->Data();
wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ; wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
if( !tool->IsSeparator() ) if( !tool->IsSeparator() )
{ {