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

BC++ fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-04-30 16:05:24 +00:00
parent da95cfa91d
commit 0e950afdf3
6 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
distrib/msw/tmake/b32.t
View File

@@ -39,11 +39,12 @@
foreach $file (sort keys %wxMSW) {
next if $wxMSW{$file} =~ /\b16\b/;
if ( $file =~ /^automtn/ ) {
#! comment in old makefile.b32 seems to imply that this file can not
#! be compiled with Borland (leads to crash in oleauto sample)
next;
}
#! if ( $file =~ /^automtn/ ) {
#! #! comment in old makefile.b32 seems to imply that this file can not
#! #! be compiled with Borland (leads to crash in oleauto sample)
#! No longer true, at least for BC++ 5.2
#! next;
#! }
$isCFile = $file =~ /\.c$/;

4
samples/oleauto/oleauto.cpp
View File

@@ -40,6 +40,10 @@
#error "Sorry, this sample works under Windows only."
#endif
#ifdef __WATCOMC__
#error "Sorry, Watcom C++ does not support wxAutomationObject."
#endif
// ----------------------------------------------------------------------------
// ressources
// ----------------------------------------------------------------------------

20
samples/regtest/regtest.cpp
View File

@@ -913,10 +913,11 @@ bool RegTreeCtrl::TreeNode::OnExpand()
if ( isEmpty ) {
// this is for the case when our last child was just deleted
m_pTree->Collapse(Id());
wxTreeItemId theId(Id()); // Temp variable seems necessary for BC++
m_pTree->Collapse(theId);
// we won't be expanded any more
m_pTree->SetItemHasChildren(Id(), FALSE);
m_pTree->SetItemHasChildren(theId, FALSE);
}
return TRUE;
@@ -935,14 +936,15 @@ void RegTreeCtrl::TreeNode::Refresh()
if ( !IsKey() )
return;
bool wasExpanded = m_pTree->IsExpanded(Id());
wxTreeItemId theId(Id()); // Temp variable seems necessary for BC++
bool wasExpanded = m_pTree->IsExpanded(theId);
if ( wasExpanded )
m_pTree->Collapse(Id());
m_pTree->Collapse(theId);
OnCollapse();
m_pTree->SetItemHasChildren(Id());
m_pTree->SetItemHasChildren(theId);
if ( wasExpanded ) {
m_pTree->Expand(Id());
m_pTree->Expand(theId);
OnExpand();
}
}
@@ -967,7 +969,8 @@ bool RegTreeCtrl::TreeNode::DeleteChild(TreeNode *child)
}
if ( ok ) {
m_pTree->Delete(child->Id());
wxTreeItemId theId(child->Id()); // Temp variable seems necessary for BC++
m_pTree->Delete(theId);
Refresh();
}
@@ -983,7 +986,8 @@ void RegTreeCtrl::TreeNode::DestroyChildren()
long lId = m_aChildren[n]->Id();
// no, wxTreeCtrl will do it
//delete m_aChildren[n];
m_pTree->Delete(lId);
wxTreeItemId theId(lId); // Temp variable seems necessary for BC++
m_pTree->Delete(theId);
}
m_aChildren.Empty();

4
src/makeb32.env
View File

@@ -13,8 +13,8 @@ WIN95FLAG = -D__WIN95__ -D__WINDOWS__
# Ilink32 is available on BC++ 5.02 and above, and all
# versions of C++ Builder.
!ifndef LINK
LINK=ilink32
#LINK=tlink32
#LINK=ilink32
LINK=tlink32
!endif
!ifndef FINAL

3
src/msw/makefile.b32
View File

@@ -218,6 +218,7 @@ COMMONOBJS = \
MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\app.obj \
$(MSWDIR)\automtn.obj \
$(MSWDIR)\bitmap.obj \
$(MSWDIR)\bmpbuttn.obj \
$(MSWDIR)\brush.obj \
@@ -517,6 +518,8 @@ $(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
$(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
$(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)

4
src/msw/ole/automtn.cpp
View File

@@ -682,8 +682,12 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
#else
variant = (bool) (oleVariant.bool != 0);
#endif
#else
#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
variant = (long) (oleVariant.boolVal != 0);
#else
variant = (bool) (oleVariant.boolVal != 0);
#endif
#endif
break;
}