Update makefile and module def for new dynlib stuff. Also some control colouring...

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

diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index b98fff55896ec6b15cb43d84d9aa5594e33601d6..9f5c9663b8cb7abbf8e75823b9e14e6c1a588e5d 100644 (file)
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -82,6 +82,14 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
 
+    LONG                            lColor = (LONG)m_backgroundColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+
     SetFont(parent->GetFont());
 
     SetSize(x, y, width, height);

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 43126e0ee961d693ab5606f1fddb08344f7fd0a9..66bf9f8ae018e3753097984d3f1984c21e6f215e 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -218,8 +218,10 @@ COMMONOBJS = \
   ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
   ..\common\$D\docview.obj \
+  ..\common\$D\dseldlg.obj \
   ..\common\$D\dynarray.obj \
   ..\common\$D\dynlib.obj \
+  ..\common\$D\dynload.obj \
   ..\common\$D\effects.obj \
   ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
@@ -270,7 +272,6 @@ COMMONOBJS = \
   ..\common\$D\mstream.obj \
   ..\common\$D\nbkbase.obj \
   ..\common\$D\object.obj \
-  ..\common\$D\objstrm.obj \
 !if "$(WXMAKINGDLL)" != "1"
 # don't have an ODBC database
   ..\common\$D\odbc.obj \
@@ -288,7 +289,6 @@ COMMONOBJS = \
   ..\common\$D\sckfile.obj \
   ..\common\$D\sckipc.obj \
   ..\common\$D\sckstrm.obj \
-  ..\common\$D\serbase.obj \
   ..\common\$D\sizer.obj \
   ..\common\$D\socket.obj \
   ..\common\$D\statbar.obj \
@@ -346,8 +346,10 @@ COMLIBOBJS1 = \
   dobjcmn.obj \
   docmdi.obj \
   docview.obj \
+  dseldlg.obj \
   dynarray.obj \
   dynlib.obj \
+  dynload.obj \
   effects.obj \
   encconv.obj \
   event.obj \
@@ -362,11 +364,11 @@ COMLIBOBJS1 = \
   fontcmn.obj \
   fontmap.obj \
   framecmn.obj \
-  fs_inet.obj \
-  fs_mem.obj \
-  fs_zip.obj
+  fs_inet.obj
 
 COMLIBOBJS2 = \
+  fs_mem.obj \
+  fs_zip.obj \
   ftp.obj \
   gaugecmn.obj \
   gdicmn.obj \
@@ -400,24 +402,22 @@ COMLIBOBJS2 = \
   mstream.obj \
   nbkbase.obj \
   object.obj \
-  objstrm.obj \
   odbc.obj \
   paper.obj \
   popupcmn.obj \
   prntbase.obj \
   process.obj \
   protocol.obj \
-  quantize.obj \
-  radiocmn.obj
+  quantize.obj
 
 COMLIBOBJS3 = \
+  radiocmn.obj \
   regex.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
   sckipc.obj \
   sckstrm.obj \
-  serbase.obj \
   sizer.obj \
   socket.obj \
   statbar.obj \
@@ -710,8 +710,10 @@ $(COMLIBOBJS1):
   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj
   copy ..\common\$D\docview.obj
+  copy ..\common\$D\dseldlg.obj
   copy ..\common\$D\dynarray.obj
   copy ..\common\$D\dynlib.obj
+  copy ..\common\$D\dynload.obj
   copy ..\common\$D\effects.obj
   copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
@@ -727,10 +729,10 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fontmap.obj
   copy ..\common\$D\framecmn.obj
   copy ..\common\$D\fs_inet.obj
-  copy ..\common\$D\fs_mem.obj
-  copy ..\common\$D\fs_zip.obj
 
 $(COMLIBOBJS2):
+  copy ..\common\$D\fs_mem.obj
+  copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
   copy ..\common\$D\gaugecmn.obj
   copy ..\common\$D\gdicmn.obj
@@ -764,7 +766,6 @@ $(COMLIBOBJS2):
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj
-  copy ..\common\$D\objstrm.obj
   copy ..\common\$D\odbc.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
@@ -772,16 +773,15 @@ $(COMLIBOBJS2):
   copy ..\common\$D\process.obj
   copy ..\common\$D\protocol.obj
   copy ..\common\$D\quantize.obj
-  copy ..\common\$D\radiocmn.obj
 
 $(COMLIBOBJS3):
+  copy ..\common\$D\radiocmn.obj
   copy ..\common\$D\regex.obj
   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
   copy ..\common\$D\sckipc.obj
   copy ..\common\$D\sckstrm.obj
-  copy ..\common\$D\serbase.obj
   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
   copy ..\common\$D\statbar.obj

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index e8558d2e8db3b005446da2a933fcd494ce1d30d8..ecb5f09f4543abe710c9e4d7c10e0ae7f0612479 100644 (file)
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -382,6 +382,27 @@ bool wxSlider::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
+    lColor = (LONG)m_backgroundColour.GetPixel();
+    ::WinSetPresParam( m_hStaticMin
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+    ::WinSetPresParam( m_hStaticMax
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+    ::WinSetPresParam( m_hStaticValue
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
     SetValue(nValue);
     return TRUE;
 } // end of wxSlider::Create

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 16a28e6c60194eb9be24a1d9bb644c1fb2ae3fc1..792a6fd3042297cc472d9e3dc57816703eaebaaa 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -72,6 +72,13 @@ bool wxStaticBox::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
+    lColor = (LONG)m_backgroundColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
     SetFont(pParent->GetFont());
     SetSize( rPos.x
             ,rPos.y

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index cb8e29c0b35b11ff8e3820065b70db4bb817780a..fbeefc707fe1a3ab8f959c3dd274c5ee962b49ec 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -91,6 +91,13 @@ bool wxStaticText::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
+    lColor = (LONG)m_backgroundColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
 
     SubclassWin(m_hWnd);
     wxControl::SetFont(pParent->GetFont());
@@ -159,6 +166,27 @@ wxSize wxStaticText::DoGetBestSize() const
                  );
 } // end of wxStaticText::DoGetBestSize
 
+void wxStaticText::DoSetSize(
+  int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+, int                               nSizeFlags
+)
+{
+    //
+    // We need to refresh the window after changing its size as the standard
+    // control doesn't always update itself properly.
+    //
+    wxStaticTextBase::DoSetSize( nX
+                                ,nY
+                                ,nWidth
+                                ,nHeight
+                                ,nSizeFlags
+                               );
+    Refresh();
+} // end of wxStaticText::DoSetSize
+
 bool wxStaticText::SetFont(
   const wxFont&                     rFont
 )

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 69469acef34c4f6c8b8c61e0675774f7c4932d8b..c0dd77587d363dbc576f476426786135c2bff786 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -1302,6 +1302,11 @@ EXPORTS
       ActivateView__12wxDocManagerFP6wxViewUlT2
       ;wxDocument::OnOpenDocument(const wxString&)
       OnOpenDocument__10wxDocumentFRC8wxString
+  ;From object file:  ..\common\dseldlg.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxDirSelector(const wxString&,const wxString&,long,const wxPoint&,wxWindow*)
+      wxDirSelector__FRC8wxStringT1lRC7wxPointP8wxWindow
+      wxDirSelectorPromptStr
   ;From object file:  ..\common\dynarray.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBaseArray::Add(long)
@@ -1346,8 +1351,6 @@ EXPORTS
       __dt__9wxLibraryFv
       ;wxLibraries::~wxLibraries()
       __dt__11wxLibrariesFv
-      ;wxDllLoader::GetSymbol(unsigned long,const wxString&)
-      GetSymbol__11wxDllLoaderFUlRC8wxString
       ;wxDllLoader::LoadLibrary(const wxString&,unsigned long*)
       LoadLibrary__11wxDllLoaderFRC8wxStringPUl
       ;wxLibraries::wxLibraries()
@@ -1364,12 +1367,15 @@ EXPORTS
       GetProgramHandle__11wxDllLoaderFv
       ;wxLibrary::PrepareClasses(wxClassInfo*)
       PrepareClasses__9wxLibraryFP11wxClassInfo
+      ;wxDllLoader::GetSymbol(unsigned long,const wxString&,unsigned long*)
+      GetSymbol__11wxDllLoaderFUlRC8wxStringPUl
       __vft9wxLibrary8wxObject
-      ;wxDllLoader::GetDllExt()
-      GetDllExt__11wxDllLoaderFv
+      ;wxDllLoader::ms_dllext
+      ms_dllext__11wxDllLoader
       ;wxLibraries::LoadLibrary(const wxString&)
       LoadLibrary__11wxLibrariesFRC8wxString
       wxTheLibraries
+  ;From object file:  ..\common\dynload.cpp
   ;From object file:  ..\common\effects.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxEffects::sm_classwxEffects
@@ -2086,8 +2092,6 @@ EXPORTS
       wxFileExists__10wxFileNameFRC8wxString
       ;wxFileName::InsertDir(int,const wxString&)
       InsertDir__10wxFileNameFiRC8wxString
-      ;wxFileName::CreateTempFileName(const wxString&)
-      CreateTempFileName__10wxFileNameFRC8wxString
       ;wxFileName::Assign(const wxString&,const wxString&,wxPathFormat)
       Assign__10wxFileNameFRC8wxStringT112wxPathFormat
       ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxPathFormat)
@@ -2098,14 +2102,16 @@ EXPORTS
       GetFormat__10wxFileNameF12wxPathFormat
       ;wxFileName::Assign(const wxFileName&)
       Assign__10wxFileNameFRC10wxFileName
+      ;wxFileName::CreateTempFileName(const wxString&,wxFile*)
+      CreateTempFileName__10wxFileNameFRC8wxStringP6wxFile
+      ;wxFileName::AssignTempFileName(const wxString&,wxFile*)
+      AssignTempFileName__10wxFileNameFRC8wxStringP6wxFile
       ;wxFileName::DirName(const wxString&)
       DirName__10wxFileNameFRC8wxString
       ;wxFileName::SetCwd(const wxString&)
       SetCwd__10wxFileNameFRC8wxString
       ;wxFileName::Rmdir(const wxString&)
       Rmdir__10wxFileNameFRC8wxString
-      ;wxFileName::AssignTempFileName(const wxString&)
-      AssignTempFileName__10wxFileNameFRC8wxString
   ;From object file:  ..\common\filesys.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft19wxFileSystemHandler8wxObject
@@ -3865,6 +3871,8 @@ EXPORTS
       InitializeModules__8wxModuleFv
       ;wxModule::m_modules
       m_modules__8wxModule
+      ;wxModule::UnregisterModule(wxModule*)
+      UnregisterModule__8wxModuleFP8wxModule
       ;wxModule::CleanUpModules()
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
@@ -3921,36 +3929,19 @@ EXPORTS
   ;From object file:  ..\common\object.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft8wxObject
-      ;wxCreateStoredObject(wxInputStream&)
-      wxCreateStoredObject__FR13wxInputStream
-      __vft15wxObjectRefData
       ;wxCreateDynamicObject(const char*)
       wxCreateDynamicObject__FPCc
-      ;wxClassInfo::wxClassInfo(const char*,const char*,const char*,int,wxObject*(*)())
-      __ct__11wxClassInfoFPCcN21iPFv_P8wxObject
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
-      ;wxObject::LoadObject(wxObjectInputStream&)
-      LoadObject__8wxObjectFR19wxObjectInputStream
-      ;wxClassInfo::IsKindOf(const wxClassInfo*) const
-      IsKindOf__11wxClassInfoCFPC11wxClassInfo
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
-      ;wxObject::StoreObject(wxObjectOutputStream&)
-      StoreObject__8wxObjectFR20wxObjectOutputStream
-      ;wxObjectRefData::~wxObjectRefData()
-      __dt__15wxObjectRefDataFv
       ;wxClassInfo::sm_first
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
       Ref__8wxObjectFRC8wxObject
       wxFalse
-      ;wxObjectRefData::wxObjectRefData()
-      __ct__15wxObjectRefDataFv
       ;wxObject::UnRef()
       UnRef__8wxObjectFv
-      ;wxClassInfo::CreateObject()
-      CreateObject__11wxClassInfoFv
       ;wxClassInfo::CleanUpClasses()
       CleanUpClasses__11wxClassInfoFv
       ;wxObject::IsKindOf(wxClassInfo*) const
@@ -3961,48 +3952,8 @@ EXPORTS
       sm_classwxObject__8wxObject
       ;wxObject::operator new(unsigned int,char*,int)
       __nw__8wxObjectFUiPci
-      ;wxObject::wxObject()
-      __ct__8wxObjectFv
-      ;wxObject::~wxObject()
-      __dt__8wxObjectFv
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
-  ;From object file:  ..\common\objstrm.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxObjectOutputStream::AddChild(wxObject*)
-      AddChild__20wxObjectOutputStreamFP8wxObject
-      ;wxObjectOutputStream::SaveObject(wxObject&)
-      SaveObject__20wxObjectOutputStreamFR8wxObject
-      ;wxObjectInputStream::LoadObject()
-      LoadObject__19wxObjectInputStreamFv
-      ;wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo&)
-      WriteObjectDef__20wxObjectOutputStreamFR18wxObjectStreamInfo
-      ;wxObjectInputStream::ProcessObjectData(wxObjectStreamInfo*)
-      ProcessObjectData__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectOutputStream::wxObjectOutputStream(wxOutputStream&)
-      __ct__20wxObjectOutputStreamFR14wxOutputStream
-      ;wxObjectInputStream::wxObjectInputStream(wxInputStream&)
-      __ct__19wxObjectInputStreamFR13wxInputStream
-      ;wxObjectInputStream::GetChild(int) const
-      GetChild__19wxObjectInputStreamCFi
-      ;wxObjectInputStream::GetParent() const
-      GetParent__19wxObjectInputStreamCFv
-      ;wxObjectOutputStream::ProcessObjectDef(wxObjectStreamInfo*)
-      ProcessObjectDef__20wxObjectOutputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::ProcessObjectDef(wxObjectStreamInfo*)
-      ProcessObjectDef__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectOutputStream::GetObjectName(wxObject*)
-      GetObjectName__20wxObjectOutputStreamFP8wxObject
-      ;wxObjectInputStream::GetChild()
-      GetChild__19wxObjectInputStreamFv
-      ;wxObjectOutputStream::ProcessObjectData(wxObjectStreamInfo*)
-      ProcessObjectData__20wxObjectOutputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::SolveName(const wxString&) const
-      SolveName__19wxObjectInputStreamCFRC8wxString
-      ;wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo*)
-      ReadObjectDef__19wxObjectInputStreamFP18wxObjectStreamInfo
-      ;wxObjectInputStream::RemoveChildren(int)
-      RemoveChildren__19wxObjectInputStreamFi
   ;From object file:  ..\common\odbc.cpp
   ;From object file:  ..\common\paper.cpp
     ;PUBDEFs (Symbols available from object file):
@@ -4591,30 +4542,6 @@ EXPORTS
       __vft14wxSocketStream13wxInputStream12wxStreamBase
       ;wxSocketOutputStream::~wxSocketOutputStream()
       __dt__20wxSocketOutputStreamFv
-  ;From object file:  ..\common\serbase.cpp
-    ;PUBDEFs (Symbols available from object file):
-      __vft21wxHashTable_Serialize8wxObject
-      __vft16wxList_Serialize8wxObject
-      ;wxObject_Serialize::sm_classwxObject_Serialize
-      sm_classwxObject_Serialize__18wxObject_Serialize
-      ;wxList_Serialize::sm_classwxList_Serialize
-      sm_classwxList_Serialize__16wxList_Serialize
-      ;wxConstructorForwxList_Serialize()
-      wxConstructorForwxList_Serialize__Fv
-      ;wxList_Serialize::StoreObject(wxObjectOutputStream&)
-      StoreObject__16wxList_SerializeFR20wxObjectOutputStream
-      ;wxHashTable_Serialize::sm_classwxHashTable_Serialize
-      sm_classwxHashTable_Serialize__21wxHashTable_Serialize
-      ;wxHashTable_Serialize::LoadObject(wxObjectInputStream&)
-      LoadObject__21wxHashTable_SerializeFR19wxObjectInputStream
-      ;wxConstructorForwxObject_Serialize()
-      wxConstructorForwxObject_Serialize__Fv
-      ;wxList_Serialize::LoadObject(wxObjectInputStream&)
-      LoadObject__16wxList_SerializeFR19wxObjectInputStream
-      ;wxConstructorForwxHashTable_Serialize()
-      wxConstructorForwxHashTable_Serialize__Fv
-      ;wxHashTable_Serialize::StoreObject(wxObjectOutputStream&)
-      StoreObject__21wxHashTable_SerializeFR20wxObjectOutputStream
   ;From object file:  ..\common\sizer.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*)
@@ -4906,8 +4833,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
       SetBufferIO__14wxStreamBufferFPvUiUl
-      ;wxOutputStream::operator<<(wxObject&)
-      __ls__14wxOutputStreamFR8wxObject
       ;wxStreamBuffer::wxStreamBuffer(wxStreamBase&,wxStreamBuffer::BufMode)
       __ct__14wxStreamBufferFR12wxStreamBaseQ2_14wxStreamBuffer7BufMode
       ;wxEndL(wxOutputStream&)
@@ -4973,11 +4898,13 @@ EXPORTS
       OnSysSeek__21wxBufferedInputStreamFl10wxSeekMode
       ;wxInputStream::GetWBack(void*,unsigned int)
       GetWBack__13wxInputStreamFPvUi
-      ;wxFilterOutputStream::~wxFilterOutputStream()
-      __dt__20wxFilterOutputStreamFv
+      ;wxStreamBuffer::SetError(wxStreamError)
+      SetError__14wxStreamBufferF13wxStreamError
       __vft14wxStreamBuffer
       ;wxBufferedOutputStream::~wxBufferedOutputStream()
       __dt__22wxBufferedOutputStreamFv
+      ;wxFilterOutputStream::~wxFilterOutputStream()
+      __dt__20wxFilterOutputStreamFv
       ;wxBufferedInputStream::wxBufferedInputStream(wxInputStream&,wxStreamBuffer*)
       __ct__21wxBufferedInputStreamFR13wxInputStreamP14wxStreamBuffer
       ;wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer&)
@@ -4988,8 +4915,6 @@ EXPORTS
       TellO__22wxBufferedOutputStreamCFv
       ;wxInputStream::TellI() const
       TellI__13wxInputStreamCFv
-      ;wxStreamBuffer::SetError(wxStreamError)
-      SetError__14wxStreamBufferF13wxStreamError
       ;wxInputStream::Peek()
       Peek__13wxInputStreamFv
       ;wxCountingOutputStream::OnSysTell() const
@@ -5012,10 +4937,10 @@ EXPORTS
       Ungetch__13wxInputStreamFPCvUi
       ;wxBufferedInputStream::Read(void*,unsigned int)
       Read__21wxBufferedInputStreamFPvUi
-      ;wxFilterInputStream::~wxFilterInputStream()
-      __dt__19wxFilterInputStreamFv
       ;wxStreamBuffer::~wxStreamBuffer()
       __dt__14wxStreamBufferFv
+      ;wxFilterInputStream::~wxFilterInputStream()
+      __dt__19wxFilterInputStreamFv
       ;wxOutputStream::Sync()
       Sync__14wxOutputStreamFv
       ;wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer*)
@@ -5052,8 +4977,6 @@ EXPORTS
       GetInputStream__14wxStreamBufferCFv
       ;wxStreamBuffer::PutChar(char)
       PutChar__14wxStreamBufferFc
-      ;wxInputStream::operator>>(wxObject*&)
-      __rs__13wxInputStreamFRP8wxObject
       ;wxInputStream::Read(wxOutputStream&)
       Read__13wxInputStreamFR14wxOutputStream
       __vft22wxCountingOutputStream12wxStreamBase
@@ -13254,8 +13177,6 @@ EXPORTS
       SetFocus__10wxRadioBoxFv
       ;wxRadioBox::OS2Command(unsigned int,unsigned short)
       OS2Command__10wxRadioBoxFUiUs
-      ;wxRadioBox::AdjustButtons(int,int,int,int,long)
-      AdjustButtons__10wxRadioBoxFiN31l
       ;wxRadioBox::SubclassRadioButton(unsigned long)
       SubclassRadioButton__10wxRadioBoxFUl
       __vft10wxRadioBox14wxRadioBoxBase
@@ -13274,6 +13195,8 @@ EXPORTS
       __vft10wxRadioBox8wxObject
       ;wxRadioBox::sm_classwxRadioBox
       sm_classwxRadioBox__10wxRadioBox
+      ;wxRadioBox::AdjustButtons(int,int,int,int,int)
+      AdjustButtons__10wxRadioBoxFiN41
       ;wxRadioBox::SetSelection(int)
       SetSelection__10wxRadioBoxFi
       ;wxRadioBox::~wxRadioBox()
@@ -13477,6 +13400,8 @@ EXPORTS
       ;wxSlider::Create(wxWindow*,int,int,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__8wxSliderFP8wxWindowiN32RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       __vft8wxSlider8wxObject
+      ;wxSlider::AdjustSubControls(int,int,int,int,int)
+      AdjustSubControls__8wxSliderFiN41
       ;wxSlider::SetRange(int,int)
       SetRange__8wxSliderFiT1
       ;wxSlider::~wxSlider()
@@ -13541,6 +13466,8 @@ EXPORTS
       SetValue__10wxSpinCtrlFRC8wxString
       ;wxSpinCtrl::sm_classwxSpinCtrl
       sm_classwxSpinCtrl__10wxSpinCtrl
+      ;wxSpinCtrl::m_svAllSpins
+      m_svAllSpins__10wxSpinCtrl
       ;wxSpinCtrl::DoGetPosition(int*,int*) const
       DoGetPosition__10wxSpinCtrlCFPiT1
       ;wxSpinCtrl::DoMoveWindow(int,int,int,int)
@@ -13576,6 +13503,7 @@ EXPORTS
       GetValue__10wxSpinCtrlCFv
   ;From object file:  ..\os2\statbmp.cpp
     ;PUBDEFs (Symbols available from object file):
+      __vft14wxStaticBitmap8wxObject
       ;wxStaticBitmap::Free()
       Free__14wxStaticBitmapFv
       ;wxStaticBitmap::Create(wxWindow*,int,const wxGDIImage&,const wxPoint&,const wxSize&,long,const wxString&)
@@ -13590,6 +13518,8 @@ EXPORTS
       ImageIsOk__14wxStaticBitmapCFv
       ;wxStaticBitmap::DoGetBestSize() const
       DoGetBestSize__14wxStaticBitmapCFv
+      ;wxStaticBitmap::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__14wxStaticBitmapFUiPvT2
   ;From object file:  ..\os2\statbox.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxStaticBox()
@@ -13605,6 +13535,8 @@ EXPORTS
       __vft11wxStaticBox8wxObject
   ;From object file:  ..\os2\stattext.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxStaticText::DoSetSize(int,int,int,int,int)
+      DoSetSize__12wxStaticTextFiN41
       ;wxStaticText::OS2WindowProc(unsigned int,void*,void*)
       OS2WindowProc__12wxStaticTextFUiPvT2
       ;wxStaticText::SetLabel(const wxString&)
@@ -14359,6 +14291,8 @@ EXPORTS
       ;wxAssociateWinWithHandle(unsigned long,wxWindow*)
       wxAssociateWinWithHandle__FUlP8wxWindow
       s_currentMsg
+      ;wxWindow::GetOS2ParentHeight(wxWindow*)
+      GetOS2ParentHeight__8wxWindowFP8wxWindow
       ;wxWindow::Refresh(unsigned long,const wxRect*)
       Refresh__8wxWindowFUlPC6wxRect
       ;wxWindow::SetScrollbar(int,int,int,int,unsigned long)
@@ -14384,6 +14318,8 @@ EXPORTS
       ;wxWindow::WarpPointer(int,int)
       WarpPointer__8wxWindowFiT1
       wxCurrentPopupMenu
+      ;wxWindow::MoveChildren(int)
+      MoveChildren__8wxWindowFi
       ;wxWindow::HandleShow(unsigned long,int)
       HandleShow__8wxWindowFUli
       ;wxWindow::HandleMove(int,int)