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

new Def file supporting const changes in wxObject. Bug fixes in STATTEXT and WINDOW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-04-20 16:10:04 +00:00
parent 8cfc5426cf
commit f15b49521a
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/os2/stattext.cpp
View File

@@ -45,7 +45,7 @@ bool wxStaticText::Create(
SetBackgroundColour(pParent->GetBackgroundColour()) ; SetBackgroundColour(pParent->GetBackgroundColour()) ;
SetForegroundColour(pParent->GetForegroundColour()) ; SetForegroundColour(pParent->GetForegroundColour()) ;
if ( id == -1 ) if ( vId == -1 )
m_windowId = (int)NewControlId(); m_windowId = (int)NewControlId();
else else
m_windowId = vId; m_windowId = vId;

2
src/os2/window.cpp
View File

@@ -2848,7 +2848,7 @@ bool wxWindow::OS2OnMeasureItem(
return FALSE; return FALSE;
} }
} }
wxWindow* pItem = FindItem(id); wxWindow* pItem = FindItem(lId);
if (pItem && pItem->IsKindOf(CLASSINFO(wxControl))) if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
{ {

16
src/os2/wx23.def
View File

@@ -3580,23 +3580,21 @@ EXPORTS
OnSysTell__20wxMemoryOutputStreamCFv OnSysTell__20wxMemoryOutputStreamCFv
;From object file: ..\common\object.cpp ;From object file: ..\common\object.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxObject::Nid
Nid__8wxObject
__vft8wxObject __vft8wxObject
;wxCreateStoredObject(wxInputStream&) ;wxCreateStoredObject(wxInputStream&)
wxCreateStoredObject__FR13wxInputStream wxCreateStoredObject__FR13wxInputStream
__vft15wxObjectRefData __vft15wxObjectRefData
;wxCreateDynamicObject(const char*) ;wxCreateDynamicObject(const char*)
wxCreateDynamicObject__FPCc wxCreateDynamicObject__FPCc
;wxObject::N ;wxClassInfo::wxClassInfo(const char*,const char*,const char*,int,wxObject*(*)())
N__8wxObject __ct__11wxClassInfoFPCcN21iPFv_P8wxObject
;wxObject::Dump(ostream&) ;wxObject::Dump(ostream&)
Dump__8wxObjectFR7ostream Dump__8wxObjectFR7ostream
wxTrue wxTrue
;wxObject::LoadObject(wxObjectInputStream&) ;wxObject::LoadObject(wxObjectInputStream&)
LoadObject__8wxObjectFR19wxObjectInputStream LoadObject__8wxObjectFR19wxObjectInputStream
;wxClassInfo::FindClass(char*) ;wxClassInfo::IsKindOf(const wxClassInfo*) const
FindClass__11wxClassInfoFPc IsKindOf__11wxClassInfoCFPC11wxClassInfo
;wxClassInfo::sm_classTable ;wxClassInfo::sm_classTable
sm_classTable__11wxClassInfo sm_classTable__11wxClassInfo
;wxObject::CopyObject(wxObject&) const ;wxObject::CopyObject(wxObject&) const
@@ -3611,8 +3609,6 @@ EXPORTS
sm_first__11wxClassInfo sm_first__11wxClassInfo
;wxObject::Ref(const wxObject&) ;wxObject::Ref(const wxObject&)
Ref__8wxObjectFRC8wxObject Ref__8wxObjectFRC8wxObject
;wxClassInfo::wxClassInfo(char*,char*,char*,int,wxObject*(*)())
__ct__11wxClassInfoFPcN21iPFv_P8wxObject
wxFalse wxFalse
;wxObjectRefData::wxObjectRefData() ;wxObjectRefData::wxObjectRefData()
__ct__15wxObjectRefDataFv __ct__15wxObjectRefDataFv
@@ -3624,6 +3620,8 @@ EXPORTS
CleanUpClasses__11wxClassInfoFv CleanUpClasses__11wxClassInfoFv
;wxObject::IsKindOf(wxClassInfo*) const ;wxObject::IsKindOf(wxClassInfo*) const
IsKindOf__8wxObjectCFP11wxClassInfo IsKindOf__8wxObjectCFP11wxClassInfo
;wxClassInfo::FindClass(const char*)
FindClass__11wxClassInfoFPCc
;wxObject::sm_classwxObject ;wxObject::sm_classwxObject
sm_classwxObject__8wxObject sm_classwxObject__8wxObject
;wxObject::operator new(unsigned int,char*,int) ;wxObject::operator new(unsigned int,char*,int)
@@ -3634,8 +3632,6 @@ EXPORTS
__dt__8wxObjectFv __dt__8wxObjectFv
;wxClassInfo::InitializeClasses() ;wxClassInfo::InitializeClasses()
InitializeClasses__11wxClassInfoFv InitializeClasses__11wxClassInfoFv
;wxClassInfo::IsKindOf(wxClassInfo*) const
IsKindOf__11wxClassInfoCFP11wxClassInfo
;From object file: ..\common\objstrm.cpp ;From object file: ..\common\objstrm.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxObjectOutputStream::AddChild(wxObject*) ;wxObjectOutputStream::AddChild(wxObject*)