From f15b49521a67a10b47374c04723d5534a131dcb0 Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Fri, 20 Apr 2001 16:10:04 +0000
Subject: [PATCH] new Def file supporting const changes in wxObject.  Bug fixes
 in STATTEXT and WINDOW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/os2/stattext.cpp |  2 +-
 src/os2/window.cpp   |  2 +-
 src/os2/wx23.def     | 16 ++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 0491f7b260..141ccf59a3 100644
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -45,7 +45,7 @@ bool wxStaticText::Create(
     SetBackgroundColour(pParent->GetBackgroundColour()) ;
     SetForegroundColour(pParent->GetForegroundColour()) ;
 
-    if ( id == -1 )
+    if ( vId == -1 )
         m_windowId = (int)NewControlId();
     else
         m_windowId = vId;
diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 82ffd920ea..94d3060d5e 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -2848,7 +2848,7 @@ bool wxWindow::OS2OnMeasureItem(
             return FALSE;
         }
     }
-    wxWindow*                      pItem = FindItem(id);
+    wxWindow*                      pItem = FindItem(lId);
 
     if (pItem && pItem->IsKindOf(CLASSINFO(wxControl)))
     {
diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 50410c2883..7e4cb535cc 100644
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -3580,23 +3580,21 @@ EXPORTS
       OnSysTell__20wxMemoryOutputStreamCFv
   ;From object file:  ..\common\object.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxObject::Nid
-      Nid__8wxObject
       __vft8wxObject
       ;wxCreateStoredObject(wxInputStream&)
       wxCreateStoredObject__FR13wxInputStream
       __vft15wxObjectRefData
       ;wxCreateDynamicObject(const char*)
       wxCreateDynamicObject__FPCc
-      ;wxObject::N
-      N__8wxObject
+      ;wxClassInfo::wxClassInfo(const char*,const char*,const char*,int,wxObject*(*)())
+      __ct__11wxClassInfoFPCcN21iPFv_P8wxObject
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
       wxTrue
       ;wxObject::LoadObject(wxObjectInputStream&)
       LoadObject__8wxObjectFR19wxObjectInputStream
-      ;wxClassInfo::FindClass(char*)
-      FindClass__11wxClassInfoFPc
+      ;wxClassInfo::IsKindOf(const wxClassInfo*) const
+      IsKindOf__11wxClassInfoCFPC11wxClassInfo
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
       ;wxObject::CopyObject(wxObject&) const
@@ -3611,8 +3609,6 @@ EXPORTS
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
       Ref__8wxObjectFRC8wxObject
-      ;wxClassInfo::wxClassInfo(char*,char*,char*,int,wxObject*(*)())
-      __ct__11wxClassInfoFPcN21iPFv_P8wxObject
       wxFalse
       ;wxObjectRefData::wxObjectRefData()
       __ct__15wxObjectRefDataFv
@@ -3624,6 +3620,8 @@ EXPORTS
       CleanUpClasses__11wxClassInfoFv
       ;wxObject::IsKindOf(wxClassInfo*) const
       IsKindOf__8wxObjectCFP11wxClassInfo
+      ;wxClassInfo::FindClass(const char*)
+      FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject
       ;wxObject::operator new(unsigned int,char*,int)
@@ -3634,8 +3632,6 @@ EXPORTS
       __dt__8wxObjectFv
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
-      ;wxClassInfo::IsKindOf(wxClassInfo*) const
-      IsKindOf__11wxClassInfoCFP11wxClassInfo
   ;From object file:  ..\common\objstrm.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxObjectOutputStream::AddChild(wxObject*)
-- 
2.45.2