]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/wx23.def
fix typo in drawing slider ticks; added assert to check for it (slightly modified...
[wxWidgets.git] / src / os2 / wx23.def
index fc4c8f05b921a25eae17a908fb1bbd7f07f764ae..fa63bc9b47477d5838368ea66a70a215afe54fab 100644 (file)
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  H:\Dev\Wx2\WxWindows\lib\wx.lib
+;From library:  H:\Dev\Wx24\WxWindows\lib\wx.lib
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
@@ -44,15 +44,15 @@ EXPORTS
   ;From object file:  ..\common\artstd.cpp
     ;PUBDEFs (Symbols available from object file):
       g_ArtProviderModule
-      ;wxDefaultArtProviderModule::sm_classwxDefaultArtProviderModule
-      sm_classwxDefaultArtProviderModule__26wxDefaultArtProviderModule
       __vft20wxDefaultArtProvider8wxObject
       ;wxDefaultArtProvider::CreateBitmap(const wxString&,const wxString&,const wxSize&)
       CreateBitmap__20wxDefaultArtProviderFRC8wxStringT1RC6wxSize
-      ;wxConstructorForwxDefaultArtProviderModule()
-      wxConstructorForwxDefaultArtProviderModule__Fv
+      ;wxArtProvider::InitStdProvider()
+      InitStdProvider__13wxArtProviderFv
   ;From object file:  ..\common\appcmn.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxAssert(int,const char*,int,const char*,const char*)
+      wxAssert__FiPCcT1N22
       ;wxAppBase::OnInitGui()
       OnInitGui__9wxAppBaseFv
       ;wxAppBase::OnInitCmdLine(wxCmdLineParser&)
@@ -68,6 +68,8 @@ EXPORTS
       OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
       ;wxTrap()
       wxTrap__Fv
+      ;wxAppBase::OnRun()
+      OnRun__9wxAppBaseFv
       ;wxAppBase::OnExit()
       OnExit__9wxAppBaseFv
       ;wxAssertIsEqual(int,int)
@@ -78,6 +80,8 @@ EXPORTS
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv
+      ;wxAppBase::CreateMessageOutput()
+      CreateMessageOutput__9wxAppBaseFv
       ;wxOnAssert(const char*,int,const char*,const char*)
       wxOnAssert__FPCciN21
       ;wxAppBase::~wxAppBase()
@@ -86,6 +90,8 @@ EXPORTS
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
       OnCmdLineError__9wxAppBaseFR15wxCmdLineParser
+      ;wxAppBase::CreateLogTarget()
+      CreateLogTarget__9wxAppBaseFv
       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
   ;From object file:  ..\common\choiccmn.cpp
@@ -159,6 +165,8 @@ EXPORTS
       Insert__14wxArrayOptionsFRC15wxCmdLineOptionUiT2
       ;wxCmdLineParserData::wxCmdLineParserData()
       __ct__19wxCmdLineParserDataFv
+      ;wxCmdLineParser::AreLongOptionsEnabled()
+      AreLongOptionsEnabled__15wxCmdLineParserFv
       ;wxCmdLineParser::SetCmdLine(const wxString&)
       SetCmdLine__15wxCmdLineParserFRC8wxString
       ;wxArrayParams::wxArrayParams(const wxArrayParams&)
@@ -199,6 +207,8 @@ EXPORTS
       __dt__15wxCmdLineParserFv
       ;wxArrayParams::~wxArrayParams()
       __dt__13wxArrayParamsFv
+      ;wxCmdLineParser::GetUsageString()
+      GetUsageString__15wxCmdLineParserFv
       ;wxArrayParams::operator=(const wxArrayParams&)
       __as__13wxArrayParamsFRC13wxArrayParams
       ;wxArrayOptions::RemoveAt(unsigned int,unsigned int)
@@ -251,12 +261,12 @@ EXPORTS
       sm_classwxFontData__10wxFontData
       ;wxPageSetupDialogData::SetPaperSize(wxPaperSize)
       SetPaperSize__21wxPageSetupDialogDataF11wxPaperSize
-      ;wxFontData::~wxFontData()
-      __dt__10wxFontDataFv
       ;wxConstructorForwxColourData()
       wxConstructorForwxColourData__Fv
       ;wxColourData::~wxColourData()
       __dt__12wxColourDataFv
+      ;wxFontData::~wxFontData()
+      __dt__10wxFontDataFv
       ;wxPrintData::wxPrintData(const wxPrintData&)
       __ct__11wxPrintDataFRC11wxPrintData
       ;wxPrintDialogData::sm_classwxPrintDialogData
@@ -295,8 +305,6 @@ EXPORTS
       __ct__21wxPageSetupDialogDataFRC21wxPageSetupDialogData
       ;wxColourData::wxColourData(const wxColourData&)
       __ct__12wxColourDataFRC12wxColourData
-      ;wxPrintData::operator=(const wxPrintSetupData&)
-      __as__11wxPrintDataFRC16wxPrintSetupData
       ;wxPrintData::~wxPrintData()
       __dt__11wxPrintDataFv
       ;wxConstructorForwxPrintDialogData()
@@ -598,10 +606,12 @@ EXPORTS
       DoEmpty__15wxDateTimeArrayFv
       ;wxDateTime::Add(const wxTimeSpan&) const
       Add__10wxDateTimeCFRC10wxTimeSpan
-      ;wxDateTime::SetMinute(unsigned short)
-      SetMinute__10wxDateTimeFUs
+      ;wxDateTime::SetToWeekDayInSameWeek(wxDateTime::WeekDay,wxDateTime::WeekFlags)
+      SetToWeekDayInSameWeek__10wxDateTimeFQ2_10wxDateTime7WeekDayQ2_10wxDateTime9WeekFlags
       ;wxDateTime::SetSecond(unsigned short)
       SetSecond__10wxDateTimeFUs
+      ;wxDateTime::SetMinute(unsigned short)
+      SetMinute__10wxDateTimeFUs
       ;wxDateTime::MakeTimezone(const wxDateTime::TimeZone&,unsigned long)
       MakeTimezone__10wxDateTimeFRCQ2_10wxDateTime8TimeZoneUl
       ;wxTimeSpan::wxTimeSpan(long,long,long,long)
@@ -638,10 +648,12 @@ EXPORTS
       GetCurrentYear__10wxDateTimeFQ2_10wxDateTime8Calendar
       ;wxDateSpan::Add(const wxDateSpan&)
       Add__10wxDateSpanFRC10wxDateSpan
-      ;wxDateTime::SetDay(unsigned short)
-      SetDay__10wxDateTimeFUs
+      ;wxDateTime::SetToTheWeek(unsigned short,wxDateTime::WeekDay,wxDateTime::WeekFlags)
+      SetToTheWeek__10wxDateTimeFUsQ2_10wxDateTime7WeekDayQ2_10wxDateTime9WeekFlags
       ;wxDateTime::SetHour(unsigned short)
       SetHour__10wxDateTimeFUs
+      ;wxDateTime::SetDay(unsigned short)
+      SetDay__10wxDateTimeFUs
       ;wxDateTime::wxDateTime(long)
       __ct__10wxDateTimeFl
       ;wxDateTime::Set(double)
@@ -674,8 +686,6 @@ EXPORTS
       IsEqualTo__10wxDateTimeCFRC10wxDateTime
       ;wxDateTime::IsBetween(const wxDateTime&,const wxDateTime&) const
       IsBetween__10wxDateTimeCFRC10wxDateTimeT1
-      ;wxDateTime::GetWeek(unsigned short,wxDateTime::WeekDay) const
-      GetWeek__10wxDateTimeCFUsQ2_10wxDateTime7WeekDay
       ;wxDateTime::GetLastWeekDay(wxDateTime::WeekDay,wxDateTime::Month,int)
       GetLastWeekDay__10wxDateTimeFQ2_10wxDateTime7WeekDayQ2_10wxDateTime5Monthi
       ;wxDateTime::GetEndDST(int,wxDateTime::Country)
@@ -723,10 +733,6 @@ EXPORTS
       TIME_T_FACTOR__10wxDateTime
       ;wxDateTime::Subtract(const wxDateTime&) const
       Subtract__10wxDateTimeCFRC10wxDateTime
-      ;wxDateTime::SetToWeekDayInSameWeek(wxDateTime::WeekDay)
-      SetToWeekDayInSameWeek__10wxDateTimeFQ2_10wxDateTime7WeekDay
-      ;wxDateTime::SetToTheWeek(unsigned short,wxDateTime::WeekDay)
-      SetToTheWeek__10wxDateTimeFUsQ2_10wxDateTime7WeekDay
       ;wxDateTime::SetToPrevWeekDay(wxDateTime::WeekDay)
       SetToPrevWeekDay__10wxDateTimeFQ2_10wxDateTime7WeekDay
       ;wxDateTime::IsSameTime(const wxDateTime&) const
@@ -767,8 +773,8 @@ EXPORTS
       Add__10wxDateTimeFRC10wxTimeSpan
       ;wxDateTime::Add(const wxDateSpan&) const
       Add__10wxDateTimeCFRC10wxDateSpan
-      ;wxDateTime::GetMonthName(wxDateTime::Month,wxDateTime::NameFlags)
-      GetMonthName__10wxDateTimeFQ2_10wxDateTime5MonthQ2_10wxDateTime9NameFlags
+      ;wxDateTime::GetWeek(unsigned short,wxDateTime::WeekDay,wxDateTime::WeekFlags) const
+      GetWeek__10wxDateTimeCFUsQ2_10wxDateTime7WeekDayQ2_10wxDateTime9WeekFlags
       ;wxDateTime::SetMillisecond(unsigned short)
       SetMillisecond__10wxDateTimeFUs
       ;wxDateTime::ParseDate(const char*)
@@ -777,10 +783,14 @@ EXPORTS
       ParseDateTime__10wxDateTimeFPCc
       ;wxDateTime::GetWeekDayName(wxDateTime::WeekDay,wxDateTime::NameFlags)
       GetWeekDayName__10wxDateTimeFQ2_10wxDateTime7WeekDayQ2_10wxDateTime9NameFlags
+      ;wxDateTime::GetMonthName(wxDateTime::Month,wxDateTime::NameFlags)
+      GetMonthName__10wxDateTimeFQ2_10wxDateTime5MonthQ2_10wxDateTime9NameFlags
       ;wxDateTime::Set(long)
       Set__10wxDateTimeFl
       ;wxDateTime::ToTimezone(const wxDateTime::TimeZone&,unsigned long) const
       ToTimezone__10wxDateTimeCFRCQ2_10wxDateTime8TimeZoneUl
+      ;wxDateTime::SetFromDOS(unsigned long)
+      SetFromDOS__10wxDateTimeFUl
       ;wxDateTimeArray::Index(const wxDateTime&,unsigned long) const
       Index__15wxDateTimeArrayCFRC10wxDateTimeUl
       ;wxDateTime::wxDateTime(unsigned short,wxDateTime::Month,int,unsigned short,unsigned short,unsigned short,unsigned short)
@@ -800,8 +810,6 @@ EXPORTS
       IsEarlierThan__10wxDateTimeCFRC10wxDateTime
       ;wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags,const wxDateTime::TimeZone&) const
       GetWeekOfMonth__10wxDateTimeCFQ2_10wxDateTime9WeekFlagsRCQ2_10wxDateTime8TimeZone
-      ;wxDateTime::GetWeekDayInSameWeek(wxDateTime::WeekDay) const
-      GetWeekDayInSameWeek__10wxDateTimeCFQ2_10wxDateTime7WeekDay
       ;wxDateTimeArray::DoCopy(const wxDateTimeArray&)
       DoCopy__15wxDateTimeArrayFRC15wxDateTimeArray
       ;wxDateTime::IsInStdRange() const
@@ -828,16 +836,20 @@ EXPORTS
       GetValue__10wxDateTimeCFv
       ;wxDateTime::GetRataDie() const
       GetRataDie__10wxDateTimeCFv
+      ;wxDateTime::GetAsDOS() const
+      GetAsDOS__10wxDateTimeCFv
       ;wxTimeSpan::Add(const wxTimeSpan&) const
       Add__10wxTimeSpanCFRC10wxTimeSpan
       ;wxDateTime::Add(const wxDateSpan&)
       Add__10wxDateTimeFRC10wxDateSpan
       ;wxTimeSpan::Abs() const
       Abs__10wxTimeSpanCFv
-      ;wxDateTime::GetYearDay(unsigned short) const
-      GetYearDay__10wxDateTimeCFUs
+      ;wxDateTime::GetWeekDayInSameWeek(wxDateTime::WeekDay,wxDateTime::WeekFlags) const
+      GetWeekDayInSameWeek__10wxDateTimeCFQ2_10wxDateTime7WeekDayQ2_10wxDateTime9WeekFlags
       ;wxDateTime::SetToYearDay(unsigned short)
       SetToYearDay__10wxDateTimeFUs
+      ;wxDateTime::GetYearDay(unsigned short) const
+      GetYearDay__10wxDateTimeCFUs
       ;wxTimeSpan::Format(const char*) const
       Format__10wxTimeSpanCFPCc
   ;From object file:  ..\common\datstrm.cpp
@@ -1153,6 +1165,8 @@ EXPORTS
       OnNewDocument__10wxDocumentFv
       ;wxView::OnCreatePrintout()
       OnCreatePrintout__6wxViewFv
+      ;wxDocument::NotifyClosing()
+      NotifyClosing__10wxDocumentFv
       ;wxDocManager::GetNoHistoryFiles() const
       GetNoHistoryFiles__12wxDocManagerCFv
       ;wxFileHistory::AddFilesToMenu()
@@ -1597,14 +1611,20 @@ EXPORTS
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
       CompareCharsetItems
+      ;wxEncodingConverter::Convert(const char*,wchar_t*)
+      Convert__19wxEncodingConverterFPCcPw
       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       Init__19wxEncodingConverterF14wxFontEncodingT1i
+      ;wxEncodingConverter::Convert(const wchar_t*,char*)
+      Convert__19wxEncodingConverterFPCwPc
       ;wxEncodingConverter::Convert(const wxString&)
       Convert__19wxEncodingConverterFRC8wxString
       ;wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding,int)
       GetPlatformEquivalents__19wxEncodingConverterF14wxFontEncodingi
       ;wxEncodingConverter::Convert(const char*,char*)
       Convert__19wxEncodingConverterFPCcPc
+      ;wxEncodingConverter::Convert(const wchar_t*,wchar_t*)
+      Convert__19wxEncodingConverterFPCwPw
   ;From object file:  ..\common\event.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSetCursorEvent::sm_classwxSetCursorEvent
@@ -1805,6 +1825,7 @@ EXPORTS
       ;wxMouseEvent::Assign(const wxMouseEvent&)
       Assign__12wxMouseEventFRC12wxMouseEvent
       wxEVT_SCROLL_LINEUP
+      wxEVT_SCROLL_ENDSCROLL
       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_NC_RIGHT_UP
@@ -1829,6 +1850,8 @@ EXPORTS
       sm_classwxEvent__7wxEvent
       ;wxEraseEvent::sm_classwxEraseEvent
       sm_classwxEraseEvent__12wxEraseEvent
+      ;wxKeyEvent::wxKeyEvent(const wxKeyEvent&)
+      __ct__10wxKeyEventFRC10wxKeyEvent
       ;wxEvtHandler::SearchEventTable(wxEventTable&,wxEvent&)
       SearchEventTable__12wxEvtHandlerFR12wxEventTableR7wxEvent
       ;wxEvtHandler::ProcessEvent(wxEvent&)
@@ -1946,7 +1969,7 @@ EXPORTS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\extended.c
+  ;From object file:  H:\DEV\WX24\WXWINDOWS\src\common\extended.c
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
@@ -2237,10 +2260,10 @@ EXPORTS
       GetTimes__10wxFileNameCFP10wxDateTimeN21
       ;wxFileName::Clear()
       Clear__10wxFileNameFv
-      ;wxFileName::wxFileExists()
-      wxFileExists__10wxFileNameFv
       ;wxFileName::GetFullName() const
       GetFullName__10wxFileNameCFv
+      ;wxFileName::DirExists()
+      DirExists__10wxFileNameFv
       ;wxFileName::AssignHomeDir()
       AssignHomeDir__10wxFileNameFv
       ;wxFileName::PrependDir(const wxString&)
@@ -2257,26 +2280,26 @@ EXPORTS
       Touch__10wxFileNameFv
       ;wxFileName::FileName(const wxString&)
       FileName__10wxFileNameFRC8wxString
-      ;wxFileName::wxPathExists(const wxString&)
-      wxPathExists__10wxFileNameFRC8wxString
       ;wxFileName::SetFullName(const wxString&)
       SetFullName__10wxFileNameFRC8wxString
       ;wxFileName::GetCwd(const wxString&)
       GetCwd__10wxFileNameFRC8wxString
+      ;wxFileName::DirExists(const wxString&)
+      DirExists__10wxFileNameFRC8wxString
       ;wxFileName::AssignCwd(const wxString&)
       AssignCwd__10wxFileNameFRC8wxString
       ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,const wxString&,wxPathFormat)
       Assign__10wxFileNameFRC8wxStringN3112wxPathFormat
-      ;wxFileName::SameAs(const wxFileName&,wxPathFormat)
-      SameAs__10wxFileNameFRC10wxFileName12wxPathFormat
+      ;wxFileName::SameAs(const wxFileName&,wxPathFormat) const
+      SameAs__10wxFileNameCFRC10wxFileName12wxPathFormat
       ;wxFileName::IsAbsolute(wxPathFormat) const
       IsAbsolute__10wxFileNameCF12wxPathFormat
       ;wxFileName::GetVolumeSeparator(wxPathFormat)
       GetVolumeSeparator__10wxFileNameF12wxPathFormat
       ;wxFileName::RemoveDir(int)
       RemoveDir__10wxFileNameFi
-      ;wxFileName::wxPathExists()
-      wxPathExists__10wxFileNameFv
+      ;wxFileName::FileExists()
+      FileExists__10wxFileNameFv
       ;wxFileName::SetCwd()
       SetCwd__10wxFileNameFv
       ;wxFileName::GetShortPath() const
@@ -2301,8 +2324,6 @@ EXPORTS
       Rmdir__10wxFileNameFv
       ;wxFileName::GetLongPath() const
       GetLongPath__10wxFileNameCFv
-      ;wxFileName::wxFileExists(const wxString&)
-      wxFileExists__10wxFileNameFRC8wxString
       ;wxFileName::InsertDir(int,const wxString&)
       InsertDir__10wxFileNameFiRC8wxString
       ;wxFileName::Assign(const wxString&,const wxString&,wxPathFormat)
@@ -2327,6 +2348,8 @@ EXPORTS
       SetCwd__10wxFileNameFRC8wxString
       ;wxFileName::Rmdir(const wxString&)
       Rmdir__10wxFileNameFRC8wxString
+      ;wxFileName::FileExists(const wxString&)
+      FileExists__10wxFileNameFRC8wxString
   ;From object file:  ..\common\filesys.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft19wxFileSystemHandler8wxObject
@@ -2604,8 +2627,8 @@ EXPORTS
       Close__5wxFTPFv
       ;wxFTP::MkDir(const wxString&)
       MkDir__5wxFTPFRC8wxString
-      ;wxFTP::wxFileExists(const wxString&)
-      wxFileExists__5wxFTPFRC8wxString
+      ;wxFTP::FileExists(const wxString&)
+      FileExists__5wxFTPFRC8wxString
       ;wxFTP::Rename(const wxString&,const wxString&)
       Rename__5wxFTPFRC8wxStringT1
       ;wxFTP::wxFTP()
@@ -2794,6 +2817,8 @@ EXPORTS
       Union__14wxRect2DDoubleFRC14wxRect2DDoubleT1P14wxRect2DDouble
       ;wxRect2DDouble::Intersects(const wxRect2DDouble&) const
       Intersects__14wxRect2DDoubleCFRC14wxRect2DDouble
+      ;wxPoint2DInt::GetVectorAngle() const
+      GetVectorAngle__12wxPoint2DIntCFv
       ;wxRect2DInt::Union(const wxRect2DInt&,const wxRect2DInt&,wxRect2DInt*)
       Union__11wxRect2DIntFRC11wxRect2DIntT1P11wxRect2DInt
       ;wxPoint2DInt::SetVectorAngle(double)
@@ -2808,8 +2833,6 @@ EXPORTS
       Intersects__11wxRect2DIntCFRC11wxRect2DInt
       ;wxPoint2DInt::WriteTo(wxDataOutputStream&) const
       WriteTo__12wxPoint2DIntCFR18wxDataOutputStream
-      ;wxPoint2DInt::GetVectorAngle()
-      GetVectorAngle__12wxPoint2DIntFv
   ;From object file:  ..\common\gifdecod.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGIFDecoder::wxGIFDecoder(wxInputStream*,unsigned long)
@@ -3461,14 +3484,16 @@ EXPORTS
       sm_classwxLocaleModule__14wxLocaleModule
       ;wxLanguageInfoArray::RemoveAt(unsigned int,unsigned int)
       RemoveAt__19wxLanguageInfoArrayFUiT1
-      ;wxLocale::GetSystemEncoding()
-      GetSystemEncoding__8wxLocaleFv
+      ;wxLocale::GetLanguageInfo(int)
+      GetLanguageInfo__8wxLocaleFi
+      ;wxLocale::CreateLanguagesDB()
+      CreateLanguagesDB__8wxLocaleFv
       ;wxLocale::~wxLocale()
       __dt__8wxLocaleFv
       ;wxLocale::GetSystemLanguage()
       GetSystemLanguage__8wxLocaleFv
-      ;wxLocale::CreateLanguagesDB()
-      CreateLanguagesDB__8wxLocaleFv
+      ;wxLocale::GetSystemEncoding()
+      GetSystemEncoding__8wxLocaleFv
       ;wxLanguageInfoArray::Index(const wxLanguageInfo&,unsigned long) const
       Index__19wxLanguageInfoArrayCFRC14wxLanguageInfoUl
       ;wxLanguageInfoArray::wxLanguageInfoArray(const wxLanguageInfoArray&)
@@ -3531,10 +3556,21 @@ EXPORTS
       IsLoaded__8wxLocaleCFPCc
   ;From object file:  ..\common\ipcbase.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxConnectionBase::wxConnectionBase(char*,int)
+      __ct__16wxConnectionBaseFPci
+      ;wxConnectionBase::wxConnectionBase(wxConnectionBase&)
+      __ct__16wxConnectionBaseFR16wxConnectionBase
       ;wxConnectionBase::sm_classwxConnectionBase
       sm_classwxConnectionBase__16wxConnectionBase
+      ;wxConnectionBase::wxConnectionBase()
+      __ct__16wxConnectionBaseFv
+      ;wxConnectionBase::~wxConnectionBase()
+      __dt__16wxConnectionBaseFv
+      ;wxConnectionBase::GetBufferAtLeast(unsigned int)
+      GetBufferAtLeast__16wxConnectionBaseFUi
       ;wxClientBase::sm_classwxClientBase
       sm_classwxClientBase__12wxClientBase
+      __vft16wxConnectionBase8wxObject
       ;wxServerBase::sm_classwxServerBase
       sm_classwxServerBase__12wxServerBase
   ;From object file:  ..\common\layout.cpp
@@ -4293,6 +4329,8 @@ EXPORTS
       ClearData__18wxMimeTypesManagerFv
       ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
       __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
+      ;wxFileType::GetOpenCommand(const wxString&) const
+      GetOpenCommand__10wxFileTypeCFRC8wxString
       ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
       GetOpenCommand__10wxFileTypeCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxFileType::GetMimeType(wxString*) const
@@ -4320,6 +4358,23 @@ EXPORTS
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
       RegisterModule__8wxModuleFP8wxModule
+  ;From object file:  ..\common\msgout.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxMessageOutputMessageBox::Printf(const char*,...)
+      Printf__25wxMessageOutputMessageBoxFPCce
+      ;wxMessageOutput::Get()
+      Get__15wxMessageOutputFv
+      ;wxMessageOutput::ms_msgOut
+      ms_msgOut__15wxMessageOutput
+      ;wxMessageOutputLog::Printf(const char*,...)
+      Printf__18wxMessageOutputLogFPCce
+      ;wxMessageOutput::Set(wxMessageOutput*)
+      Set__15wxMessageOutputFP15wxMessageOutput
+      __vft25wxMessageOutputMessageBox15wxMessageOutput
+      __vft21wxMessageOutputStderr15wxMessageOutput
+      __vft18wxMessageOutputLog15wxMessageOutput
+      ;wxMessageOutputStderr::Printf(const char*,...)
+      Printf__21wxMessageOutputStderrFPCce
   ;From object file:  ..\common\mstream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxMemoryOutputStream::CopyTo(void*,unsigned int) const
@@ -4403,6 +4458,8 @@ EXPORTS
       FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject
+      ;wxClassInfo::~wxClassInfo()
+      __dt__11wxClassInfoFv
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
   ;From object file:  ..\common\odbc.cpp
@@ -4553,10 +4610,12 @@ EXPORTS
       SetZoom__18wxPrintPreviewBaseFi
       ;wxPrintout::GetPageInfo(int*,int*,int*,int*)
       GetPageInfo__10wxPrintoutFPiN31
-      ;wxPrinterBase::~wxPrinterBase()
-      __dt__13wxPrinterBaseFv
+      ;wxPreviewControlBar::OnFirst()
+      OnFirst__19wxPreviewControlBarFv
       ;wxPreviewControlBar::sm_eventTable
       sm_eventTable__19wxPreviewControlBar
+      ;wxPrinterBase::~wxPrinterBase()
+      __dt__13wxPrinterBaseFv
       ;wxPreviewFrame::CreateCanvas()
       CreateCanvas__14wxPreviewFrameFv
       ;wxPreviewControlBar::CreateButtons()
@@ -4587,6 +4646,8 @@ EXPORTS
       OnBeginDocument__10wxPrintoutFiT1
       ;wxPrintPreviewBase::Init(wxPrintout*,wxPrintout*)
       Init__18wxPrintPreviewBaseFP10wxPrintoutT1
+      ;wxPreviewControlBar::OnGoto()
+      OnGoto__19wxPreviewControlBarFv
       ;wxPrintout::~wxPrintout()
       __dt__10wxPrintoutFv
       ;wxPrintout::OnEndDocument()
@@ -4644,6 +4705,8 @@ EXPORTS
       __dt__14wxPreviewFrameFv
       ;wxPreviewControlBar::OnPrevious()
       OnPrevious__19wxPreviewControlBarFv
+      ;wxPreviewControlBar::OnLast()
+      OnLast__19wxPreviewControlBarFv
       ;wxPreviewControlBar::GetEventTable() const
       GetEventTable__19wxPreviewControlBarCFv
       ;wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase*,wxFrame*,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
@@ -4658,14 +4721,20 @@ EXPORTS
       Exists__9wxProcessFi
       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv
-      ;wxProcess::Init(wxEvtHandler*,int,unsigned long)
-      Init__9wxProcessFP12wxEvtHandleriUl
-      __vft9wxProcess8wxObject
       ;wxProcess::Kill(int,wxSignal)
       Kill__9wxProcessFi8wxSignal
+      __vft9wxProcess8wxObject
+      ;wxProcess::Open(const wxString&,int)
+      Open__9wxProcessFRC8wxStringi
+      ;wxProcess::IsErrorAvailable() const
+      IsErrorAvailable__9wxProcessCFv
       wxEVT_END_PROCESS
+      ;wxProcess::Init(wxEvtHandler*,int,int)
+      Init__9wxProcessFP12wxEvtHandleriT2
       ;wxProcess::~wxProcess()
       __dt__9wxProcessFv
+      ;wxProcess::IsInputOpened() const
+      IsInputOpened__9wxProcessCFv
       ;wxConstructorForwxProcessEvent()
       wxConstructorForwxProcessEvent__Fv
       ;wxProcess::sm_classwxProcess
@@ -4676,6 +4745,8 @@ EXPORTS
       OnTerminate__9wxProcessFiT1
       ;wxProcess::Detach()
       Detach__9wxProcessFv
+      ;wxProcess::IsInputAvailable() const
+      IsInputAvailable__9wxProcessCFv
   ;From object file:  ..\common\protocol.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxProtocol::wxProtocol()
@@ -5058,9 +5129,11 @@ EXPORTS
       SetScreenType__16wxSystemSettingsF18wxSystemScreenType
   ;From object file:  ..\common\sizer.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxSizer::Show(wxSizer*,unsigned long)
+      Show__7wxSizerFP7wxSizerUl
+      __vft11wxGridSizer8wxObject
       ;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*)
       __ct__11wxSizerItemFiN41P8wxObject
-      __vft11wxGridSizer8wxObject
       ;wxSizerItem::wxSizerItem(wxSizer*,int,int,int,wxObject*)
       __ct__11wxSizerItemFP7wxSizeriN22P8wxObject
       ;wxSizer::Insert(int,wxSizer*,int,int,int,wxObject*)
@@ -5131,6 +5204,8 @@ EXPORTS
       RecalcSizes__16wxStaticBoxSizerFv
       ;wxSizerItem::IsWindow()
       IsWindow__11wxSizerItemFv
+      ;wxSizer::IsShown(wxSizer*)
+      IsShown__7wxSizerFP7wxSizer
       ;wxSizerItem::GetSize()
       GetSize__11wxSizerItemFv
       ;wxNotebookSizer::CalcMin()
@@ -5141,10 +5216,14 @@ EXPORTS
       Remove__7wxSizerFP8wxWindow
       ;wxSizer::FitSize(wxWindow*)
       FitSize__7wxSizerFP8wxWindow
-      ;wxSizer::Clear(unsigned long)
-      Clear__7wxSizerFUl
+      ;wxSizer::Show(wxWindow*,unsigned long)
+      Show__7wxSizerFP8wxWindowUl
       __vft7wxSizer8wxObject
       __vft15wxNotebookSizer8wxObject
+      ;wxSizer::ShowItems(unsigned long)
+      ShowItems__7wxSizerFUl
+      ;wxSizer::Clear(unsigned long)
+      Clear__7wxSizerFUl
       ;wxSizer::Remove(int)
       Remove__7wxSizerFi
       ;wxSizer::GetMinSize()
@@ -5168,10 +5247,12 @@ EXPORTS
       Add__7wxSizerFP7wxSizeriN22P8wxObject
       ;wxSizer::Prepend(int,int,int,int,int,wxObject*)
       Prepend__7wxSizerFiN41P8wxObject
-      ;wxFlexGridSizer::AddGrowableCol(unsigned int)
-      AddGrowableCol__15wxFlexGridSizerFUi
+      ;wxGridSizer::CalcRowsCols(int&,int&) const
+      CalcRowsCols__11wxGridSizerCFRiT1
       ;wxBoxSizer::wxBoxSizer(int)
       __ct__10wxBoxSizerFi
+      ;wxFlexGridSizer::AddGrowableCol(unsigned int)
+      AddGrowableCol__15wxFlexGridSizerFUi
       ;wxSizerItem::IsSizer()
       IsSizer__11wxSizerItemFv
       ;wxNotebookSizer::sm_classwxNotebookSizer
@@ -5189,6 +5270,8 @@ EXPORTS
       DeleteWindows__11wxSizerItemFv
       ;wxSizer::GetMinClientSize(wxWindow*)
       GetMinClientSize__7wxSizerFP8wxWindow
+      ;wxSizer::IsShown(wxWindow*)
+      IsShown__7wxSizerFP8wxWindow
       ;wxSizer::GetMaxClientSize(wxWindow*)
       GetMaxClientSize__7wxSizerFP8wxWindow
       ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
@@ -5374,33 +5457,74 @@ EXPORTS
       __vft18wxwxListStringNode10wxNodeBase
   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxCSConv::wxCSConv(const wxCSConv&)
+      __ct__8wxCSConvFRC8wxCSConv
+      __vft8wxCSConv8wxMBConv
+      __vft12wxMBConvUTF78wxMBConv
+      ;wxMBConv::cMB2WC(const char*) const
+      cMB2WC__8wxMBConvCFPCc
+      ;wxCSConv::SetName(const char*)
+      SetName__8wxCSConvFPCc
+      ;wxMBConvUTF7::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__12wxMBConvUTF7CFPwPCcUi
+      wxConvISO8859_1
       ;wxStrConvModule::sm_classwxStrConvModule
       sm_classwxStrConvModule__15wxStrConvModule
+      ;wxMBConvUTF8::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__12wxMBConvUTF8CFPcPCwUi
+      ;wxMBConvUTF8::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__12wxMBConvUTF8CFPwPCcUi
+      ;wxMBConv::~wxMBConv()
+      __dt__8wxMBConvFv
+      __vft12wxMBConvUTF88wxMBConv
       wxConvCurrent
-      wxConvFile
+      ;wxMBConv::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__8wxMBConvCFPcPCwUi
+      ;wxCSConv::Clear()
+      Clear__8wxCSConvFv
+      ;wxCSConv::~wxCSConv()
+      __dt__8wxCSConvFv
+      ;wxCSConv::operator=(const wxCSConv&)
+      __as__8wxCSConvFRC8wxCSConv
+      wxConvUTF7
+      wxConvLocal
+      wxConvUTF8
+      ;wxMBConvUTF7::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__12wxMBConvUTF7CFPcPCwUi
+      ;wxCSConv::WC2MB(char*,const wchar_t*,unsigned int) const
+      WC2MB__8wxCSConvCFPcPCwUi
+      ;wxCSConv::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__8wxCSConvCFPwPCcUi
+      ;wxCSConv::LoadNow()
+      LoadNow__8wxCSConvFv
+      ;wxCSConv::wxCSConv(const char*)
+      __ct__8wxCSConvFPCc
       wxConvLibc
+      ;wxMBConv::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__8wxMBConvCFPwPCcUi
       ;wxConstructorForwxStrConvModule()
       wxConstructorForwxStrConvModule__Fv
+      __vft8wxMBConv
+      ;wxMBConv::cWC2MB(const wchar_t*) const
+      cWC2MB__8wxMBConvCFPCw
   ;From object file:  ..\common\stream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)
       SetBufferIO__14wxStreamBufferFPvUiUl
-      ;wxStreamBuffer::wxStreamBuffer(wxStreamBase&,wxStreamBuffer::BufMode)
-      __ct__14wxStreamBufferFR12wxStreamBaseQ2_14wxStreamBuffer7BufMode
+      ;wxStreamBuffer::wxStreamBuffer(wxStreamBuffer::BufMode)
+      __ct__14wxStreamBufferFQ2_14wxStreamBuffer7BufMode
       ;wxEndL(wxOutputStream&)
       wxEndL__FR14wxOutputStream
       __vft22wxBufferedOutputStream12wxStreamBase
       __vft14wxOutputStream12wxStreamBase
-      ;wxStreamBuffer::wxStreamBuffer(wxStreamBuffer::BufMode)
-      __ct__14wxStreamBufferFQ2_14wxStreamBuffer7BufMode
+      ;wxStreamBuffer::wxStreamBuffer(wxStreamBase&,wxStreamBuffer::BufMode)
+      __ct__14wxStreamBufferFR12wxStreamBaseQ2_14wxStreamBuffer7BufMode
       ;wxStreamBuffer::Write(const void*,unsigned int)
       Write__14wxStreamBufferFPCvUi
       ;wxInputStream::SeekI(long,wxSeekMode)
       SeekI__13wxInputStreamFl10wxSeekMode
       ;wxBufferedInputStream::OnSysRead(void*,unsigned int)
       OnSysRead__21wxBufferedInputStreamFPvUi
-      ;wxInputStream::OnSysRead(void*,unsigned int)
-      OnSysRead__13wxInputStreamFPvUi
       ;wxOutputStream::~wxOutputStream()
       __dt__14wxOutputStreamFv
       ;wxInputStream::~wxInputStream()
@@ -5527,6 +5651,8 @@ EXPORTS
       Init__14wxStreamBufferFv
       ;wxStreamBuffer::GetInputStream() const
       GetInputStream__14wxStreamBufferCFv
+      ;wxInputStream::CanRead() const
+      CanRead__13wxInputStreamCFv
       ;wxStreamBuffer::PutChar(char)
       PutChar__14wxStreamBufferFc
       ;wxInputStream::Read(wxOutputStream&)
@@ -5548,14 +5674,14 @@ EXPORTS
       GetFromBuffer__14wxStreamBufferFPvUi
       ;wxInputStream::AllocSpaceWBack(unsigned int)
       AllocSpaceWBack__13wxInputStreamFUi
+      ;wxStreamBuffer::ResetBuffer()
+      ResetBuffer__14wxStreamBufferFv
       ;wxOutputStream::wxOutputStream()
       __ct__14wxOutputStreamFv
       ;wxBufferedInputStream::TellI() const
       TellI__21wxBufferedInputStreamCFv
       ;wxBufferedOutputStream::Sync()
       Sync__22wxBufferedOutputStreamFv
-      ;wxStreamBuffer::ResetBuffer()
-      ResetBuffer__14wxStreamBufferFv
       ;wxStreamBuffer::Read(wxStreamBuffer*)
       Read__14wxStreamBufferFP14wxStreamBuffer
       ;wxBufferedInputStream::Peek()
@@ -5586,6 +5712,8 @@ EXPORTS
       find_first_of__8wxStringCFPCcUi
       ;operator+(const wxString&,const wxString&)
       __pl__FRC8wxStringT1
+      ;wxString::wxString(const wchar_t*,wxMBConv&,unsigned int)
+      __ct__8wxStringFPCwR8wxMBConvUi
       ;wxString::wxString(const void*,const void*)
       __ct__8wxStringFPCvT1
       ;wxArrayString::Sort(int(*)(const wxString&,const wxString&))
@@ -5658,8 +5786,6 @@ EXPORTS
       AfterLast__8wxStringCFc
       ;wxString::find(char,unsigned int) const
       find__8wxStringCFcUi
-      ;wxVsnprintf(char*,unsigned int,const char*,char*)
-      wxVsnprintf__FPcUiPCcT1
       ;wxString::rfind(const wxString&,unsigned int) const
       rfind__8wxStringCFRC8wxStringUi
       ;wxString::replace(unsigned int,unsigned int,const char*,unsigned int)
@@ -5701,6 +5827,8 @@ EXPORTS
       __pl__FRC8wxStringPCc
       ;wxArrayString::operator==(const wxArrayString&) const
       __eq__13wxArrayStringCFRC13wxArrayString
+      ;wxString::operator=(const wchar_t*)
+      __as__8wxStringFPCw
       ;wxString::StartsWith(const char*,wxString*) const
       StartsWith__8wxStringCFPCcP8wxString
       ;wxArrayString::Remove(const char*)
@@ -5739,8 +5867,6 @@ EXPORTS
       ToDouble__8wxStringCFPd
       ;wxString::wxString(char,unsigned int)
       __ct__8wxStringFcUi
-      ;wxSnprintf(char*,unsigned int,const char*,...)
-      wxSnprintf__FPcUiPCce
       ;wxString::ToULong(unsigned long*,int) const
       ToULong__8wxStringCFPUli
       ;wxString::Right(unsigned int) const
@@ -6037,6 +6163,8 @@ EXPORTS
       __dt__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
+      ;wxTopLevelWindowBase::IsLastBeforeExit() const
+      IsLastBeforeExit__20wxTopLevelWindowBaseCFv
       ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
@@ -6150,7 +6278,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\unzip.c
+  ;From object file:  H:\DEV\WX24\WXWINDOWS\src\common\unzip.c
     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo
@@ -6294,8 +6422,6 @@ EXPORTS
       wxStripMenuCodes__FPCcPc
       ;wxSafeYield(wxWindow*)
       wxSafeYield__FP8wxWindow
-      ;StringMatch(const char*,const char*,unsigned long,unsigned long)
-      StringMatch__FPCcT1UlT3
       ;wxFindMenuItemId(wxFrame*,const wxString&,const wxString&)
       wxFindMenuItemId__FP7wxFrameRC8wxStringT2
       ;wxGetUserName()
@@ -6333,6 +6459,8 @@ EXPORTS
       __vft18wxGenericValidator8wxObject
       ;wxGenericValidator::Copy(const wxGenericValidator&)
       Copy__18wxGenericValidatorFRC18wxGenericValidator
+      ;wxGenericValidator::sm_classwxGenericValidator
+      sm_classwxGenericValidator__18wxGenericValidator
       ;wxGenericValidator::TransferFromWindow()
       TransferFromWindow__18wxGenericValidatorFv
   ;From object file:  ..\common\validate.cpp
@@ -6616,6 +6744,8 @@ EXPORTS
       sm_classwxVariantDataChar__17wxVariantDataChar
       ;wxVariant::operator==(void*) const
       __eq__9wxVariantCFPv
+      ;wxVariant::NullList()
+      NullList__9wxVariantFv
       ;wxVariant::GetList() const
       GetList__9wxVariantCFv
       ;wxVariant::GetCount() const
@@ -7052,8 +7182,8 @@ EXPORTS
       DoSetVirtualSize__12wxWindowBaseFiT1
       ;wxWindowBase::DoHitTest(int,int) const
       DoHitTest__12wxWindowBaseCFiT1
-      ;wxWindowBase::DoGetBestSize() const
-      DoGetBestSize__12wxWindowBaseCFv
+      ;wxWindowBase::FitInside()
+      FitInside__12wxWindowBaseFv
       ;wxWindowBase::TransferDataFromWindow()
       TransferDataFromWindow__12wxWindowBaseFv
       ;wxWindowBase::IsTopLevel() const
@@ -7064,6 +7194,8 @@ EXPORTS
       GetHelpText__12wxWindowBaseCFv
       ;wxWindowBase::GetAncestorWithCustomPalette() const
       GetAncestorWithCustomPalette__12wxWindowBaseCFv
+      ;wxWindowBase::DoGetBestSize() const
+      DoGetBestSize__12wxWindowBaseCFv
       ;wxWindowBase::FindWindowByLabel(const wxString&,const wxWindow*)
       FindWindowByLabel__12wxWindowBaseFRC8wxStringPC8wxWindow
       ;wxWindowBase::FindWindowByName(const wxString&,const wxWindow*)
@@ -7108,10 +7240,18 @@ EXPORTS
       wxGetTopLevelParent__FP8wxWindow
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxVsnprintf_(char*,unsigned int,const char*,char*)
+      wxVsnprintf___FPcUiPCcT1
+      ;wxMB2WC(wchar_t*,const char*,unsigned int)
+      wxMB2WC__FPwPCcUi
+      ;wxSnprintf_(char*,unsigned int,const char*,...)
+      wxSnprintf___FPcUiPCce
+      ;wxWC2MB(char*,const wchar_t*,unsigned int)
+      wxWC2MB__FPcPCwUi
       ;wxOKlibc()
       wxOKlibc__Fv
-      ;wcslen(const wchar_t*)
-      wcslen__FPCw
+      ;wxStrtok(char*,const char*,char**)
+      wxStrtok__FPcPCcPPc
   ;From object file:  ..\common\wxexpr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExpr::GetAttributeValue(const wxString&,long&) const
@@ -7408,6 +7548,8 @@ EXPORTS
       HitTest__14wxCalendarCtrlFRC7wxPointP10wxDateTimePQ2_10wxDateTime7WeekDay
       ;wxCalendarCtrl::DoGetPosition(int*,int*) const
       DoGetPosition__14wxCalendarCtrlCFPiT1
+      ;wxCalendarCtrl::wxCalendarCtrl(wxWindow*,int,const wxDateTime&,const wxPoint&,const wxSize&,long,const wxString&)
+      __ct__14wxCalendarCtrlFP8wxWindowiRC10wxDateTimeRC7wxPointRC6wxSizelRC8wxString
       ;wxCalendarCtrl::Enable(unsigned long)
       Enable__14wxCalendarCtrlFUl
       wxEVT_CALENDAR_WEEKDAY_CLICKED
@@ -7621,41 +7763,20 @@ EXPORTS
       __dt__17wxBufferedPaintDCFv
   ;From object file:  ..\generic\dcpsg.cpp
     ;PUBDEFs (Symbols available from object file):
-      __vft23wxPostScriptPrintDialog8wxObject
       ;wxPostScriptDC::wxPostScriptDC(const wxPrintData&)
       __ct__14wxPostScriptDCFRC11wxPrintData
-      ;wxGetPrinterScaling(double*,double*)
-      wxGetPrinterScaling__FPdT1
-      ;wxPostScriptPrintDialog::wxPostScriptPrintDialog(wxWindow*,const wxString&,const wxPoint&,const wxSize&,int)
-      __ct__23wxPostScriptPrintDialogFP8wxWindowRC8wxStringRC7wxPointRC6wxSizei
       ;wxPostScriptDC::DoDrawPoint(int,int)
       DoDrawPoint__14wxPostScriptDCFiT1
       ;wxPostScriptDC::DoDrawLines(int,wxPoint*,int,int)
       DoDrawLines__14wxPostScriptDCFiP7wxPointN21
       ;wxPostScriptDC::DoDrawEllipse(int,int,int,int)
       DoDrawEllipse__14wxPostScriptDCFiN31
-      ;wxPostScriptPrintDialog::ShowModal()
-      ShowModal__23wxPostScriptPrintDialogFv
-      ;wxGetPrinterCommand()
-      wxGetPrinterCommand__Fv
-      ;wxGetPrintPreviewCommand()
-      wxGetPrintPreviewCommand__Fv
-      ;wxPrintSetupData::~wxPrintSetupData()
-      __dt__16wxPrintSetupDataFv
       ;wxPostScriptDC::StartPage()
       StartPage__14wxPostScriptDCFv
-      ;wxPostScriptModule::OnInit()
-      OnInit__18wxPostScriptModuleFv
       ;wxPostScriptDC::GetCharHeight() const
       GetCharHeight__14wxPostScriptDCCFv
       ;wxPostScriptDC::EndPage()
       EndPage__14wxPostScriptDCFv
-      ;wxPostScriptDC::Create(const wxString&,unsigned long,wxWindow*)
-      Create__14wxPostScriptDCFRC8wxStringUlP8wxWindow
-      ;wxSetPrinterFile(const wxString&)
-      wxSetPrinterFile__FRC8wxString
-      ;wxSetAFMPath(const wxString&)
-      wxSetAFMPath__FRC8wxString
       ;wxPostScriptDC::DoDrawRotatedText(const wxString&,int,int,double)
       DoDrawRotatedText__14wxPostScriptDCFRC8wxStringiT2d
       __vft14wxPostScriptDC8wxObject
@@ -7665,17 +7786,6 @@ EXPORTS
       DoDrawSpline__14wxPostScriptDCFP6wxList
       ;wxPostScriptDC::DoSetClippingRegion(int,int,int,int)
       DoSetClippingRegion__14wxPostScriptDCFiN31
-      wxThePrintSetupData
-      ;wxSetPrinterMode(int)
-      wxSetPrinterMode__Fi
-      ;wxGetPrinterTranslation(int*,int*)
-      wxGetPrinterTranslation__FPiT1
-      ;wxPrintSetupData::sm_classwxPrintSetupData
-      sm_classwxPrintSetupData__16wxPrintSetupData
-      ;wxPrintSetupData::operator=(const wxPrintData&)
-      __as__16wxPrintSetupDataFRC11wxPrintData
-      ;wxPrintSetupData::operator=(wxPrintSetupData&)
-      __as__16wxPrintSetupDataFR16wxPrintSetupData
       ;wxPostScriptDC::SetLogicalFunction(int)
       SetLogicalFunction__14wxPostScriptDCFi
       ;wxPostScriptDC::DoGetSizeMM(int*,int*) const
@@ -7686,21 +7796,10 @@ EXPORTS
       DoDrawLine__14wxPostScriptDCFiN31
       ;wxPostScriptDC::DoGetPixel(int,int,wxColour*) const
       DoGetPixel__14wxPostScriptDCCFiT1P8wxColour
-      ;wxConstructorForwxPostScriptModule()
-      wxConstructorForwxPostScriptModule__Fv
-      ;wxPostScriptDC::wxPostScriptDC(const wxString&,unsigned long,wxWindow*)
-      __ct__14wxPostScriptDCFRC8wxStringUlP8wxWindow
       ;wxPostScriptDC::DoDrawRoundedRectangle(int,int,int,int,double)
       DoDrawRoundedRectangle__14wxPostScriptDCFiN31d
-      ;wxInitializePrintSetupData(unsigned long)
-      wxInitializePrintSetupData__FUl
-      __vft18wxPostScriptModule8wxObject
       ;wxPostScriptDC::SetResolution(int)
       SetResolution__14wxPostScriptDCFi
-      ;wxSetPrinterScaling(double,double)
-      wxSetPrinterScaling__FdT1
-      ;wxPostScriptModule::sm_classwxPostScriptModule
-      sm_classwxPostScriptModule__18wxPostScriptModule
       ;wxPostScriptDC::SetDeviceOrigin(int,int)
       SetDeviceOrigin__14wxPostScriptDCFiT1
       ;wxPostScriptDC::SetAxisOrientation(unsigned long,unsigned long)
@@ -7711,20 +7810,12 @@ EXPORTS
       DoDrawPolygon__14wxPostScriptDCFiP7wxPointN31
       ;wxPostScriptDC::DoDrawEllipticArc(int,int,int,int,double,double)
       DoDrawEllipticArc__14wxPostScriptDCFiN31dT5
-      ;wxPostScriptDC::GetResolution()
-      GetResolution__14wxPostScriptDCFv
-      ;wxGetPrinterFile()
-      wxGetPrinterFile__Fv
       ;wxConstructorForwxPostScriptDC()
       wxConstructorForwxPostScriptDC__Fv
       ;wxPostScriptDC::wxPostScriptDC()
       __ct__14wxPostScriptDCFv
-      ;wxPostScriptModule::OnExit()
-      OnExit__18wxPostScriptModuleFv
-      ;wxPostScriptDC::PrinterDialog(wxWindow*)
-      PrinterDialog__14wxPostScriptDCFP8wxWindow
-      ;wxSetPrinterOptions(const wxString&)
-      wxSetPrinterOptions__FRC8wxString
+      ;wxPostScriptDC::GetResolution()
+      GetResolution__14wxPostScriptDCFv
       ;wxPostScriptDC::DoDrawBitmap(const wxBitmap&,int,int,unsigned long)
       DoDrawBitmap__14wxPostScriptDCFRC8wxBitmapiT2Ul
       ;wxPostScriptDC::SetBackground(const wxBrush&)
@@ -7737,14 +7828,6 @@ EXPORTS
       DoBlit__14wxPostScriptDCFiN31P4wxDCN31UlN21
       ;wxPostScriptDC::~wxPostScriptDC()
       __dt__14wxPostScriptDCFv
-      ;wxGetPrinterOptions()
-      wxGetPrinterOptions__Fv
-      ;wxGetPrinterMode()
-      wxGetPrinterMode__Fv
-      ;wxGetAFMPath()
-      wxGetAFMPath__Fv
-      ;wxConstructorForwxPrintSetupData()
-      wxConstructorForwxPrintSetupData__Fv
       ;wxPostScriptDC::Ok() const
       Ok__14wxPostScriptDCCFv
       ;wxPostScriptDC::GetPPI() const
@@ -7757,31 +7840,16 @@ EXPORTS
       Clear__14wxPostScriptDCFv
       ;wxPostScriptDC::StartDoc(const wxString&)
       StartDoc__14wxPostScriptDCFRC8wxString
-      ;wxSetPrinterCommand(const wxString&)
-      wxSetPrinterCommand__FRC8wxString
-      ;wxSetPrintPreviewCommand(const wxString&)
-      wxSetPrintPreviewCommand__FRC8wxString
-      ;wxPostScriptPrintDialog::sm_classwxPostScriptPrintDialog
-      sm_classwxPostScriptPrintDialog__23wxPostScriptPrintDialog
       ;wxPostScriptDC::sm_classwxPostScriptDC
       sm_classwxPostScriptDC__14wxPostScriptDC
       ;wxPostScriptDC::SetFont(const wxFont&)
       SetFont__14wxPostScriptDCFRC6wxFont
-      __vft16wxPrintSetupData8wxObject
       ;wxPostScriptDC::SetBrush(const wxBrush&)
       SetBrush__14wxPostScriptDCFRC7wxBrush
       ;wxPostScriptDC::DoGetSize(int*,int*) const
       DoGetSize__14wxPostScriptDCCFPiT1
-      ;wxSetPrinterTranslation(int,int)
-      wxSetPrinterTranslation__FiT1
-      ;wxSetPrinterOrientation(int)
-      wxSetPrinterOrientation__Fi
       ;wxPostScriptDC::DoDrawIcon(const wxIcon&,int,int)
       DoDrawIcon__14wxPostScriptDCFRC6wxIconiT2
-      ;wxGetPrinterOrientation()
-      wxGetPrinterOrientation__Fv
-      ;wxPrintSetupData::wxPrintSetupData()
-      __ct__16wxPrintSetupDataFv
       ;wxPostScriptDC::SetPen(const wxPen&)
       SetPen__14wxPostScriptDCFRC5wxPen
       ;wxPostScriptDC::GetCharWidth() const
@@ -7854,13 +7922,13 @@ EXPORTS
       ;wxGenericDirCtrl::OnEndEditItem(wxTreeEvent&)
       OnEndEditItem__16wxGenericDirCtrlFR11wxTreeEvent
       __vft13wxDirItemData12wxClientData
-      ;wxGenericDirCtrl::Init()
-      Init__16wxGenericDirCtrlFv
-      __vft19wxDirFilterListCtrl15wxItemContainer
       ;wxDirItemData::~wxDirItemData()
       __dt__13wxDirItemDataFv
+      __vft19wxDirFilterListCtrl15wxItemContainer
       ;wxGenericDirCtrl::ParseFilter(const wxString&,wxArrayString&,wxArrayString&)
       ParseFilter__16wxGenericDirCtrlFRC8wxStringR13wxArrayStringT2
+      ;wxGenericDirCtrl::Init()
+      Init__16wxGenericDirCtrlFv
       ;wxDirFilterListCtrl::GetEventTable() const
       GetEventTable__19wxDirFilterListCtrlCFv
       ;wxGenericDirCtrl::ExpandDir(wxTreeItemId)
@@ -7869,14 +7937,14 @@ EXPORTS
       sm_eventTableEntries__19wxDirFilterListCtrl
       ;wxDirFilterListCtrl::OnSelFilter(wxCommandEvent&)
       OnSelFilter__19wxDirFilterListCtrlFR14wxCommandEvent
-      ;wxGenericDirCtrl::SetFilterIndex(int)
-      SetFilterIndex__16wxGenericDirCtrlFi
       ;wxDirFilterListCtrl::FillFilterList(const wxString&,int)
       FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
-      ;wxGenericDirCtrl::ReCreateTree()
-      ReCreateTree__16wxGenericDirCtrlFv
+      ;wxGenericDirCtrl::SetFilterIndex(int)
+      SetFilterIndex__16wxGenericDirCtrlFi
       ;wxGenericDirCtrl::SetupSections()
       SetupSections__16wxGenericDirCtrlFv
+      ;wxGenericDirCtrl::ReCreateTree()
+      ReCreateTree__16wxGenericDirCtrlFv
       ;wxGenericDirCtrl::ShowHidden(unsigned long)
       ShowHidden__16wxGenericDirCtrlFUl
       ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
@@ -8009,6 +8077,8 @@ EXPORTS
       InsertRows__17wxGridStringTableFUiT1
       ;wxGridTableBase::GetValueAsBool(int,int)
       GetValueAsBool__15wxGridTableBaseFiT1
+      ;wxGridCellAttr::GetSize(int*,int*) const
+      GetSize__14wxGridCellAttrCFPiT1
       ;wxGrid::GetRowBottom(int) const
       GetRowBottom__6wxGridCFi
       ;wxGridTypeRegistry::GetEditor(int)
@@ -8058,6 +8128,8 @@ EXPORTS
       LookupAttr__6wxGridCFiT1PP14wxGridCellAttr
       ;wxGridCellAttrProvider::InitData()
       InitData__22wxGridCellAttrProviderFv
+      ;wxGrid::GetSelectionMode() const
+      GetSelectionMode__6wxGridCFv
       ;wxGridCellAttr::GetRenderer(wxGrid*,int,int) const
       GetRenderer__14wxGridCellAttrCFP6wxGridiT2
       ;wxGridColLabelWindow::GetEventTable() const
@@ -8170,14 +8242,14 @@ EXPORTS
       SetColFormatFloat__6wxGridFiN21
       ;wxGridTableBase::SetColAttr(wxGridCellAttr*,int)
       SetColAttr__15wxGridTableBaseFP14wxGridCellAttri
+      ;wxGrid::SetCellSize(int,int,int,int)
+      SetCellSize__6wxGridFiN31
       ;wxGridRowOrColAttrData::SetAttr(wxGridCellAttr*,int)
       SetAttr__22wxGridRowOrColAttrDataFP14wxGridCellAttri
       ;wxGridCellWithAttrArray::RemoveAt(unsigned int,unsigned int)
       RemoveAt__23wxGridCellWithAttrArrayFUiT1
       ;wxGrid::MakeCellVisible(int,int)
       MakeCellVisible__6wxGridFiT1
-      ;wxGrid::IsInSelection(int,int)
-      IsInSelection__6wxGridFiT1
       ;wxGridTableBase::InsertRows(unsigned int,unsigned int)
       InsertRows__15wxGridTableBaseFUiT1
       ;wxGridStringTable::GetValue(int,int)
@@ -8267,6 +8339,10 @@ EXPORTS
       GetTextColour__14wxGridCellAttrCFv
       ;wxGridCellNumberRenderer::GetString(wxGrid&,int,int)
       GetString__24wxGridCellNumberRendererFR6wxGridiT2
+      ;wxGrid::GetSelectionBlockTopLeft() const
+      GetSelectionBlockTopLeft__6wxGridCFv
+      ;wxGrid::GetSelectedCells() const
+      GetSelectedCells__6wxGridCFv
       ;wxGrid::GetEventTable() const
       GetEventTable__6wxGridCFv
       ;wxGrid::GetDefaultRowSize()
@@ -8371,8 +8447,8 @@ EXPORTS
       BeginEdit__21wxGridCellFloatEditorFiT1P6wxGrid
       ;wxGrid::AppendRows(int,unsigned long)
       AppendRows__6wxGridFiUl
-      ;wxGrid::SetRowSize(int,int)
-      SetRowSize__6wxGridFiT1
+      ;wxGrid::IsInSelection(int,int) const
+      IsInSelection__6wxGridCFiT1
       ;wxGridStringTable::sm_classwxGridStringTable
       sm_classwxGridStringTable__17wxGridStringTable
       ;wxGridColLabelWindow::wxGridColLabelWindow(wxGrid*,int,const wxPoint&,const wxSize&)
@@ -8389,6 +8465,8 @@ EXPORTS
       YToRow__6wxGridFi
       ;wxGridCellAttrProvider::UpdateAttrCols(unsigned int,int)
       UpdateAttrCols__22wxGridCellAttrProviderFUii
+      ;wxGrid::SetRowSize(int,int)
+      SetRowSize__6wxGridFiT1
       ;wxGrid::SetRowMinimalHeight(int,int)
       SetRowMinimalHeight__6wxGridFiT1
       ;wxGrid::SetRowLabelSize(int)
@@ -8446,6 +8524,8 @@ EXPORTS
       SetDefaultCellTextColour__6wxGridFRC8wxColour
       ;wxGrid::SetCellRenderer(int,int,wxGridCellRenderer*)
       SetCellRenderer__6wxGridFiT1P18wxGridCellRenderer
+      ;wxGrid::SetAttr(int,int,wxGridCellAttr*)
+      SetAttr__6wxGridFiT1P14wxGridCellAttr
       ;wxGridCellAttrProvider::SetAttr(wxGridCellAttr*,int,int)
       SetAttr__22wxGridCellAttrProviderFP14wxGridCellAttriT2
       ;wxGrid::SendEvent(const int,int,int)
@@ -8464,8 +8544,12 @@ EXPORTS
       IsSelection__6wxGridFv
       ;wxGrid::IsCellEditControlEnabled() const
       IsCellEditControlEnabled__6wxGridCFv
+      ;wxGrid::GetSelectionBlockBottomRight() const
+      GetSelectionBlockBottomRight__6wxGridCFv
       ;wxGridCornerLabelWindow::GetEventTable() const
       GetEventTable__23wxGridCornerLabelWindowCFv
+      ;wxGrid::GetDefaultCellOverflow()
+      GetDefaultCellOverflow__6wxGridFv
       ;wxGrid::EndBatch()
       EndBatch__6wxGridFv
       ;wxGrid::DrawCellHighlight(wxDC&,const wxGridCellAttr*)
@@ -8513,6 +8597,8 @@ EXPORTS
       __ct__22wxGridCellChoiceEditorFUiPC8wxStringUl
       ;wxGridCellTextEditor::StartingKey(wxKeyEvent&)
       StartingKey__20wxGridCellTextEditorFR10wxKeyEvent
+      ;wxGrid::SetDefaultCellOverflow(unsigned long)
+      SetDefaultCellOverflow__6wxGridFUl
       ;wxGridWindow::ScrollWindow(int,int,const wxRect*)
       ScrollWindow__12wxGridWindowFiT1PC6wxRect
       ;wxGrid::ProcessRowLabelMouseEvent(wxMouseEvent&)
@@ -8575,6 +8661,8 @@ EXPORTS
       __as__17wxGridStringArrayFRC17wxGridStringArray
       ;wxGridRowOrColAttrData::UpdateAttrRowsOrCols(unsigned int,int)
       UpdateAttrRowsOrCols__22wxGridRowOrColAttrDataFUii
+      ;wxGridCellAttr::SetSize(int,int)
+      SetSize__14wxGridCellAttrFiT1
       ;wxGrid::SetColSize(int,int)
       SetColSize__6wxGridFiT1
       ;wxGrid::SetColLabelAlignment(int,int)
@@ -8605,6 +8693,8 @@ EXPORTS
       GetColLabelAlignment__6wxGridFPiT1
       ;wxGrid::GetCellTextColour(int,int)
       GetCellTextColour__6wxGridFiT1
+      ;wxGrid::GetCellOverflow(int,int)
+      GetCellOverflow__6wxGridFiT1
       ;wxGrid::GetCellFont(int,int)
       GetCellFont__6wxGridFiT1
       ;wxGrid::DeselectRow(int)
@@ -8645,6 +8735,8 @@ EXPORTS
       GetString__23wxGridCellFloatRendererFR6wxGridiT2
       ;wxGridCellFloatEditor::GetString() const
       GetString__21wxGridCellFloatEditorCFv
+      ;wxGrid::GetSelectedRows() const
+      GetSelectedRows__6wxGridCFv
       ;wxGridStringTable::GetNumberCols()
       GetNumberCols__17wxGridStringTableFv
       ;wxGrid::GetModelValues()
@@ -8685,6 +8777,8 @@ EXPORTS
       SetParameters__21wxGridCellFloatEditorFRC8wxString
       ;wxGridStringTable::SetColLabelValue(int,const wxString&)
       SetColLabelValue__17wxGridStringTableFiRC8wxString
+      ;wxGrid::GetCellSize(int,int,int*,int*)
+      GetCellSize__6wxGridFiT1PiT3
       ;wxGrid::GetCellAlignment(int,int,int*,int*)
       GetCellAlignment__6wxGridFiT1PiT3
       ;wxGrid::DrawGridSpace(wxDC&)
@@ -8710,8 +8804,12 @@ EXPORTS
       SetReadOnly__6wxGridFiT1Ul
       ;wxGrid::SetLabelFont(const wxFont&)
       SetLabelFont__6wxGridFRC6wxFont
+      ;wxGrid::SetCellOverflow(int,int,unsigned long)
+      SetCellOverflow__6wxGridFiT1Ul
       ;wxGrid::SelectCol(int,unsigned long)
       SelectCol__6wxGridFiUl
+      ;wxGrid::Refresh(unsigned long,const wxRect*)
+      Refresh__6wxGridFUlPC6wxRect
       ;wxGrid::ProcessGridCellMouseEvent(wxMouseEvent&)
       ProcessGridCellMouseEvent__6wxGridFR12wxMouseEvent
       ;wxGridColLabelWindow::OnMouseWheel(wxMouseEvent&)
@@ -8832,6 +8930,8 @@ EXPORTS
       InitColWidths__6wxGridFv
       ;wxGrid::HideCellEditControl()
       HideCellEditControl__6wxGridFv
+      ;wxGrid::GetSelectedCols() const
+      GetSelectedCols__6wxGridCFv
       ;wxGridStringTable::GetNumberRows()
       GetNumberRows__17wxGridStringTableFv
       ;wxGridCellAttr::GetFont() const
@@ -9001,39 +9101,43 @@ EXPORTS
       KeywordSearch__24wxHTMLHelpControllerBaseFRC8wxString
   ;From object file:  ..\generic\imaglist.cpp
     ;PUBDEFs (Symbols available from object file):
-      __vft11wxImageList8wxObject
-      ;wxImageList::Add(const wxBitmap&,const wxColour&)
-      Add__11wxImageListFRC8wxBitmapRC8wxColour
-      ;wxImageList::Add(const wxBitmap&,const wxBitmap&)
-      Add__11wxImageListFRC8wxBitmapT1
-      ;wxImageList::Remove(int)
-      Remove__11wxImageListFi
-      ;wxImageList::Create()
-      Create__11wxImageListFv
-      ;wxImageList::Add(const wxBitmap&)
-      Add__11wxImageListFRC8wxBitmap
+      ;wxGenericImageList::sm_classwxGenericImageList
+      sm_classwxGenericImageList__18wxGenericImageList
+      ;wxGenericImageList::Create()
+      Create__18wxGenericImageListFv
+      ;wxGenericImageList::GetSize(int,int&,int&) const
+      GetSize__18wxGenericImageListCFiRiT2
+      ;wxGenericImageList::Draw(int,wxDC&,int,int,int,unsigned long)
+      Draw__18wxGenericImageListFiR4wxDCN31Ul
+      ;wxGenericImageList::GetImageCount() const
+      GetImageCount__18wxGenericImageListCFv
+      ;wxGenericImageList::RemoveAll()
+      RemoveAll__18wxGenericImageListFv
+      ;wxGenericImageList::Replace(int,const wxBitmap&)
+      Replace__18wxGenericImageListFiRC8wxBitmap
       ;wxImageList::sm_classwxImageList
       sm_classwxImageList__11wxImageList
-      ;wxImageList::Replace(int,const wxBitmap&)
-      Replace__11wxImageListFiRC8wxBitmap
-      ;wxImageList::wxImageList(int,int,unsigned long,int)
-      __ct__11wxImageListFiT1UlT1
-      ;wxImageList::Create(int,int,unsigned long,int)
-      Create__11wxImageListFiT1UlT1
-      ;wxImageList::~wxImageList()
-      __dt__11wxImageListFv
-      ;wxImageList::GetSize(int,int&,int&) const
-      GetSize__11wxImageListCFiRiT2
-      ;wxImageList::Draw(int,wxDC&,int,int,int,unsigned long)
-      Draw__11wxImageListFiR4wxDCN31Ul
-      ;wxImageList::GetImageCount() const
-      GetImageCount__11wxImageListCFv
-      ;wxImageList::GetBitmap(int) const
-      GetBitmap__11wxImageListCFi
+      ;wxGenericImageList::Remove(int)
+      Remove__18wxGenericImageListFi
+      ;wxGenericImageList::~wxGenericImageList()
+      __dt__18wxGenericImageListFv
+      ;wxConstructorForwxGenericImageList()
+      wxConstructorForwxGenericImageList__Fv
+      __vft18wxGenericImageList8wxObject
+      ;wxGenericImageList::Add(const wxBitmap&,const wxBitmap&)
+      Add__18wxGenericImageListFRC8wxBitmapT1
+      ;wxGenericImageList::Add(const wxBitmap&,const wxColour&)
+      Add__18wxGenericImageListFRC8wxBitmapRC8wxColour
+      ;wxGenericImageList::Add(const wxBitmap&)
+      Add__18wxGenericImageListFRC8wxBitmap
+      ;wxGenericImageList::wxGenericImageList(int,int,unsigned long,int)
+      __ct__18wxGenericImageListFiT1UlT1
+      ;wxGenericImageList::GetBitmap(int) const
+      GetBitmap__18wxGenericImageListCFi
+      ;wxGenericImageList::Create(int,int,unsigned long,int)
+      Create__18wxGenericImageListFiT1UlT1
       ;wxConstructorForwxImageList()
       wxConstructorForwxImageList__Fv
-      ;wxImageList::RemoveAll()
-      RemoveAll__11wxImageListFv
   ;From object file:  ..\generic\laywin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent&)
@@ -9059,9 +9163,9 @@ EXPORTS
       LayoutFrame__17wxLayoutAlgorithmFP7wxFrameP8wxWindow
       ;wxSashLayoutWindow::sm_classwxSashLayoutWindow
       sm_classwxSashLayoutWindow__18wxSashLayoutWindow
+      wxEVT_CALCULATE_LAYOUT
       ;wxCalculateLayoutEvent::sm_classwxCalculateLayoutEvent
       sm_classwxCalculateLayoutEvent__22wxCalculateLayoutEvent
-      wxEVT_CALCULATE_LAYOUT
       ;wxConstructorForwxQueryLayoutInfoEvent()
       wxConstructorForwxQueryLayoutInfoEvent__Fv
       wxEVT_QUERY_LAYOUT_INFO
@@ -9076,34 +9180,38 @@ EXPORTS
       wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTable
       sm_eventTable__14wxListTextCtrl
-      ;wxListCtrl::sm_eventTableEntries
-      sm_eventTableEntries__10wxListCtrl
-      ;wxListCtrl::SortItems(int(*)(long,long,long),long)
-      SortItems__10wxListCtrlFPFlN21_il
-      ;wxListCtrl::SetItemPosition(long,const wxPoint&)
-      SetItemPosition__10wxListCtrlFlRC7wxPoint
+      ;wxGenericListCtrl::SetSingleStyle(long,unsigned long)
+      SetSingleStyle__17wxGenericListCtrlFlUl
       ;wxListMainWindow::SendNotify(unsigned int,int,wxPoint)
       SendNotify__16wxListMainWindowFUii7wxPoint
       ;wxSelectionStore::SelectRange(unsigned int,unsigned int,unsigned long,wxArrayInt*)
       SelectRange__16wxSelectionStoreFUiT1UlP10wxArrayInt
+      ;wxGenericListCtrl::RefreshItem(long)
+      RefreshItem__17wxGenericListCtrlFl
       ;wxListHeaderWindow::OnSetFocus(wxFocusEvent&)
       OnSetFocus__18wxListHeaderWindowFR12wxFocusEvent
       ;wxListMainWindow::OnPaint(wxPaintEvent&)
       OnPaint__16wxListMainWindowFR12wxPaintEvent
       ;wxListTextCtrl::OnKillFocus(wxFocusEvent&)
       OnKillFocus__14wxListTextCtrlFR12wxFocusEvent
-      ;wxListCtrl::OnIdle(wxIdleEvent&)
-      OnIdle__10wxListCtrlFR11wxIdleEvent
       ;wxListMainWindow::HighlightAll(unsigned long)
       HighlightAll__16wxListMainWindowFUl
       ;wxListMainWindow::DeleteItem(long)
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
       __ct__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxListTextCtrl::wxListTextCtrl(wxListMainWindow*,unsigned int)
+      __ct__14wxListTextCtrlFP16wxListMainWindowUi
       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1
+      ;wxGenericListCtrl::SetItem(wxListItem&)
+      SetItem__17wxGenericListCtrlFR10wxListItem
       ;wxListLineData::SetItem(int,const wxListItem&)
       SetItem__14wxListLineDataFiRC10wxListItem
+      ;wxGenericListCtrl::SetColumnWidth(int,int)
+      SetColumnWidth__17wxGenericListCtrlFiT1
+      ;wxGenericListCtrl::ScrollList(int,int)
+      ScrollList__17wxGenericListCtrlFiT1
       ;wxListMainWindow::RefreshLine(unsigned int)
       RefreshLine__16wxListMainWindowFUi
       ;wxSelectionStore::OnItemDelete(unsigned int)
@@ -9114,104 +9222,118 @@ EXPORTS
       GetLineRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineLabelRect(unsigned int) const
       GetLineLabelRect__16wxListMainWindowCFUi
-      ;wxListMainWindow::GetItem(wxListItem&)
-      GetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem
-      ;wxListCtrl::FindItem(long,long)
-      FindItem__10wxListCtrlFlT1
       ;wxListItemData::Init()
       Init__14wxListItemDataFv
-      ;wxConstructorForwxListTextCtrl()
-      wxConstructorForwxListTextCtrl__Fv
       ;wxListHeaderWindow::~wxListHeaderWindow()
       __dt__18wxListHeaderWindowFv
       ;wxListMainWindow::wxListMainWindow()
       __ct__16wxListMainWindowFv
       ;wxListHeaderData::wxListHeaderData()
       __ct__16wxListHeaderDataFv
-      ;wxListCtrl::SetFocus()
-      SetFocus__10wxListCtrlFv
-      ;wxListCtrl::SetCursor(const wxCursor&)
-      SetCursor__10wxListCtrlFRC8wxCursor
+      ;wxGenericListCtrl::Thaw()
+      Thaw__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::SetTextColour(const wxColour&)
+      SetTextColour__17wxGenericListCtrlFRC8wxColour
+      ;wxGenericListCtrl::SetForegroundColour(const wxColour&)
+      SetForegroundColour__17wxGenericListCtrlFRC8wxColour
       ;wxListLineData::ReverseHighlight()
       ReverseHighlight__14wxListLineDataFv
-      ;wxListMainWindow::OnRenameAccept()
-      OnRenameAccept__16wxListMainWindowFv
       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
       ;wxListHeaderWindow::Init()
       Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
-      ;wxListCtrl::GetTopItem() const
-      GetTopItem__10wxListCtrlCFv
-      ;wxListCtrl::GetItemCount() const
-      GetItemCount__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetTopItem() const
+      GetTopItem__17wxGenericListCtrlCFv
+      ;wxListMainWindow::GetNextItem(long,int,int) const
+      GetNextItem__16wxListMainWindowCFliT2
       ;wxListMainWindow::GetImageSize(int,int&,int&) const
       GetImageSize__16wxListMainWindowCFiRiT2
-      ;wxListCtrl::Freeze()
-      Freeze__10wxListCtrlFv
+      ;wxGenericListCtrl::GetEventTable() const
+      GetEventTable__17wxGenericListCtrlCFv
+      ;wxGenericListCtrl::GetDropTarget() const
+      GetDropTarget__17wxGenericListCtrlCFv
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
-      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
+      ;wxGenericListCtrl::ClearAll()
+      ClearAll__17wxGenericListCtrlFv
+      ;wxListMainWindow::OnRenameAccept(unsigned int,const wxString&)
+      OnRenameAccept__16wxListMainWindowFUiRC8wxString
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
-      ;wxListMainWindow::GetItemRect(long,wxRect&)
-      GetItemRect__16wxListMainWindowFlR6wxRect
+      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
+      ;wxGenericListCtrl::SetItemText(long,const wxString&)
+      SetItemText__17wxGenericListCtrlFlRC8wxString
+      ;wxGenericListCtrl::Edit(long)
+      Edit__17wxGenericListCtrlFl
       wxEVT_COMMAND_LIST_ITEM_FOCUSED
       wxEVT_COMMAND_LIST_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED
       wxEVT_COMMAND_LIST_CACHE_HINT
+      ;wxGenericListCtrl::sm_eventTable
+      sm_eventTable__17wxGenericListCtrl
       __vft14wxListTextCtrl8wxObject
-      ;wxListCtrl::SetItemSpacing(int,unsigned long)
-      SetItemSpacing__10wxListCtrlFiUl
+      ;wxGenericListCtrl::SetItemCount(long)
+      SetItemCount__17wxGenericListCtrlFl
       ;wxListMainWindow::SetItemCount(long)
       SetItemCount__16wxListMainWindowFl
-      ;wxListCtrl::SetDropTarget(wxDropTarget*)
-      SetDropTarget__10wxListCtrlFP12wxDropTarget
       ;wxListMainWindow::RecalculatePositions(unsigned long)
       RecalculatePositions__16wxListMainWindowFUl
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent
       ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
       OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent
-      ;wxListLineDataArray::operator=(const wxListLineDataArray&)
-      __as__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxGenericListCtrl::GetItemData(long) const
+      GetItemData__17wxGenericListCtrlCFl
+      ;wxGenericListCtrl::GetItemState(long,long) const
+      GetItemState__17wxGenericListCtrlCFlT1
       wxEVT_COMMAND_LIST_INSERT_ITEM
       ;wxListItem::sm_classwxListItem
       sm_classwxListItem__10wxListItem
       list_ctrl_compare_func_1
       list_ctrl_compare_data
+      ;wxListLineDataArray::operator=(const wxListLineDataArray&)
+      __as__19wxListLineDataArrayFRC19wxListLineDataArray
       ;wxListHeaderData::SetItem(const wxListItem&)
       SetItem__16wxListHeaderDataFRC10wxListItem
-      ;wxListCtrl::SetItem(wxListItem&)
-      SetItem__10wxListCtrlFR10wxListItem
       ;wxListMainWindow::SetItemState(long,long,long)
       SetItemState__16wxListMainWindowFlN21
       ;wxListMainWindow::SetImageList(wxImageList*,int)
       SetImageList__16wxListMainWindowFP11wxImageListi
+      ;wxGenericListCtrl::SetColumn(int,wxListItem&)
+      SetColumn__17wxGenericListCtrlFiR10wxListItem
       ;wxListMainWindow::SetColumnWidth(int,int)
       SetColumnWidth__16wxListMainWindowFiT1
-      ;wxListCtrl::OnGetItemText(long,long) const
-      OnGetItemText__10wxListCtrlCFlT1
+      ;wxGenericListCtrl::RefreshItems(long,long)
+      RefreshItems__17wxGenericListCtrlFlT1
+      ;wxGenericListCtrl::OnGetItemText(long,long) const
+      OnGetItemText__17wxGenericListCtrlCFlT1
       ;wxListMainWindow::MoveToItem(unsigned int)
       MoveToItem__16wxListMainWindowFUi
       ;wxListHeaderData::IsHit(int,int) const
       IsHit__16wxListHeaderDataCFiT1
       ;wxListItemData::IsHit(int,int) const
       IsHit__14wxListItemDataCFiT1
-      ;wxListCtrl::InsertItem(wxListItem&)
-      InsertItem__10wxListCtrlFR10wxListItem
+      ;wxGenericListCtrl::InsertItem(long,int)
+      InsertItem__17wxGenericListCtrlFli
       ;wxListMainWindow::HitTest(int,int,int&)
       HitTest__16wxListMainWindowFiT1Ri
-      ;wxListCtrl::HitTest(const wxPoint&,int&)
-      HitTest__10wxListCtrlFRC7wxPointRi
+      ;wxGenericListCtrl::GetImageList(int) const
+      GetImageList__17wxGenericListCtrlCFi
+      ;wxGenericListCtrl::GetColumn(int,wxListItem&) const
+      GetColumn__17wxGenericListCtrlCFiR10wxListItem
       ;wxListMainWindow::GetColumn(int,wxListItem&) const
       GetColumn__16wxListMainWindowCFiR10wxListItem
+      ;wxGenericListCtrl::DeleteColumn(int)
+      DeleteColumn__17wxGenericListCtrlFi
       ;wxListMainWindow::CacheLineData(unsigned int)
       CacheLineData__16wxListMainWindowFUi
-      ;wxwxListItemDataListNode::DeleteData()
-      DeleteData__24wxwxListItemDataListNodeFv
+      ;wxGenericListCtrl::AssignImageList(wxImageList*,int)
+      AssignImageList__17wxGenericListCtrlFP11wxImageListi
+      ;wxGenericListCtrl::GetNextItem(long,int,int) const
+      GetNextItem__17wxGenericListCtrlCFliT2
       ;wxConstructorForwxListCtrl()
       wxConstructorForwxListCtrl__Fv
       list_ctrl_compare_func_2
@@ -9219,8 +9341,8 @@ EXPORTS
       __dt__16wxListMainWindowFv
       ;wxListHeaderWindow::wxListHeaderWindow()
       __ct__18wxListHeaderWindowFv
-      ;wxListCtrl::SetItemTextColour(long,const wxColour&)
-      SetItemTextColour__10wxListCtrlFlRC8wxColour
+      ;wxGenericListCtrl::SetItem(long,int,const wxString&,int)
+      SetItem__17wxGenericListCtrlFliRC8wxStringT2
       ;wxListLineData::SetAttr(wxListItemAttr*)
       SetAttr__14wxListLineDataFP14wxListItemAttr
       ;wxListMainWindow::RefreshSelected()
@@ -9231,14 +9353,20 @@ EXPORTS
       Insert__19wxListLineDataArrayFRC14wxListLineDataUiT2
       ;wxListItemData::GetX() const
       GetX__14wxListItemDataCFv
-      ;wxListCtrl::GetTextColour() const
-      GetTextColour__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetTextColour() const
+      GetTextColour__17wxGenericListCtrlCFv
       ;wxListMainWindow::GetHeaderWidth() const
       GetHeaderWidth__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetForegroundColour() const
+      GetForegroundColour__17wxGenericListCtrlCFv
       ;wxListTextCtrl::GetEventTable() const
       GetEventTable__14wxListTextCtrlCFv
+      ;wxGenericListCtrl::DoPopupMenu(wxMenu*,int,int)
+      DoPopupMenu__17wxGenericListCtrlFP6wxMenuiT2
       ;wxListMainWindow::DoDeleteAllItems()
       DoDeleteAllItems__16wxListMainWindowFv
+      ;wxwxListItemDataListNode::DeleteData()
+      DeleteData__24wxwxListItemDataListNodeFv
       ;wxListLineData::wxListLineData(wxListMainWindow*)
       __ct__14wxListLineDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_SET_INFO
@@ -9255,40 +9383,48 @@ EXPORTS
       sm_classwxListMainWindow__16wxListMainWindow
       ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
       __ct__17wxListRenameTimerFP16wxListMainWindow
-      ;wxListCtrl::InsertColumn(long,const wxString&,int,int)
-      InsertColumn__10wxListCtrlFlRC8wxStringiT3
-      ;wxListCtrl::Edit(long)
-      Edit__10wxListCtrlFl
+      ;wxGenericListCtrl::InsertColumn(long,const wxString&,int,int)
+      InsertColumn__17wxGenericListCtrlFlRC8wxStringiT3
+      ;wxListLineData::DrawTextFormatted(wxDC*,const wxString&,int,int,int,int)
+      DrawTextFormatted__14wxListLineDataFP4wxDCRC8wxStringiN33
+      ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const
+      Index__19wxListLineDataArrayCFRC14wxListLineDataUl
+      ;wxGenericListCtrl::sm_eventTableEntries
+      sm_eventTableEntries__17wxGenericListCtrl
       ;wxListEvent::sm_classwxListEvent
       sm_classwxListEvent__11wxListEvent
       ;wxListCtrl::sm_classwxListCtrl
       sm_classwxListCtrl__10wxListCtrl
       __vft18wxListHeaderWindow8wxObject
       __vft17wxListRenameTimer8wxObject
+      ;wxGenericListCtrl::SortItems(int(*)(long,long,long),long)
+      SortItems__17wxGenericListCtrlFPFlN21_il
       ;wxListMainWindow::SortItems(int(*)(long,long,long),long)
       SortItems__16wxListMainWindowFPFlN21_il
-      ;wxListCtrl::SetSingleStyle(long,unsigned long)
-      SetSingleStyle__10wxListCtrlFlUl
+      ;wxGenericListCtrl::SetWindowStyleFlag(long)
+      SetWindowStyleFlag__17wxGenericListCtrlFl
+      ;wxGenericListCtrl::SetItemSpacing(int,unsigned long)
+      SetItemSpacing__17wxGenericListCtrlFiUl
       ;wxListMainWindow::SetItemSpacing(int,unsigned long)
       SetItemSpacing__16wxListMainWindowFiUl
-      ;wxListCtrl::SetItemCount(long)
-      SetItemCount__10wxListCtrlFl
-      ;wxListCtrl::OnSize(wxSizeEvent&)
-      OnSize__10wxListCtrlFR11wxSizeEvent
+      ;wxGenericListCtrl::SetItemPosition(long,const wxPoint&)
+      SetItemPosition__17wxGenericListCtrlFlRC7wxPoint
       ;wxListHeaderWindow::OnMouse(wxMouseEvent&)
       OnMouse__18wxListHeaderWindowFR12wxMouseEvent
+      ;wxGenericListCtrl::OnIdle(wxIdleEvent&)
+      OnIdle__17wxGenericListCtrlFR11wxIdleEvent
+      ;wxGenericListCtrl::OnGetItemAttr(long) const
+      OnGetItemAttr__17wxGenericListCtrlCFl
       ;wxListTextCtrl::OnChar(wxKeyEvent&)
       OnChar__14wxListTextCtrlFR10wxKeyEvent
-      ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const
-      Index__19wxListLineDataArrayCFRC14wxListLineDataUl
-      ;wxListCtrl::GetItemTextColour(long) const
-      GetItemTextColour__10wxListCtrlCFl
-      ;wxListCtrl::GetItemBackgroundColour(long) const
-      GetItemBackgroundColour__10wxListCtrlCFl
-      ;wxListCtrl::FindItem(long,const wxString&,unsigned long)
-      FindItem__10wxListCtrlFlRC8wxStringUl
-      ;wxListCtrl::SetItemState(long,long,long)
-      SetItemState__10wxListCtrlFlN21
+      ;wxGenericListCtrl::GetItemText(long) const
+      GetItemText__17wxGenericListCtrlCFl
+      ;wxListMainWindow::GetItemRect(long,wxRect&) const
+      GetItemRect__16wxListMainWindowCFlR6wxRect
+      ;wxGenericListCtrl::GetItemPosition(long,wxPoint&) const
+      GetItemPosition__17wxGenericListCtrlCFlR7wxPoint
+      ;wxListLineData::SetImage(int,int)
+      SetImage__14wxListLineDataFiT1
       ;wxListHeaderData::wxListHeaderData(const wxListItem&)
       __ct__16wxListHeaderDataFRC10wxListItem
       ;wxListHeaderData::SetWidth(int)
@@ -9297,159 +9433,152 @@ EXPORTS
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1
-      ;wxListLineData::SetImage(int,int)
-      SetImage__14wxListLineDataFiT1
       ;wxListHeaderData::SetHeight(int)
       SetHeight__16wxListHeaderDataFi
       ;wxListHeaderData::SetFormat(int)
       SetFormat__16wxListHeaderDataFi
-      ;wxListCtrl::SetColumnWidth(int,int)
-      SetColumnWidth__10wxListCtrlFiT1
       ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
       RefreshLines__16wxListMainWindowFUiT1
-      ;wxListCtrl::InsertItem(long,int)
-      InsertItem__10wxListCtrlFli
+      ;wxGenericListCtrl::InsertColumn(long,wxListItem&)
+      InsertColumn__17wxGenericListCtrlFlR10wxListItem
+      ;wxGenericListCtrl::HitTest(const wxPoint&,int&)
+      HitTest__17wxGenericListCtrlFRC7wxPointRi
       ;wxListMainWindow::GetVisibleLinesRange(unsigned int*,unsigned int*)
       GetVisibleLinesRange__16wxListMainWindowFPUiT1
-      ;wxListCtrl::GetItem(wxListItem&) const
-      GetItem__10wxListCtrlCFR10wxListItem
+      ;wxGenericListCtrl::GetColumnWidth(int) const
+      GetColumnWidth__17wxGenericListCtrlCFi
+      ;wxGenericListCtrl::FindItem(long,const wxPoint&,int)
+      FindItem__17wxGenericListCtrlFlRC7wxPointi
       ;wxListMainWindow::FindItem(long,long)
       FindItem__16wxListMainWindowFlT1
       ;wxListMainWindow::DrawImage(int,wxDC*,int,int)
       DrawImage__16wxListMainWindowFiP4wxDCN21
-      ;wxListCtrl::DeleteColumn(int)
-      DeleteColumn__10wxListCtrlFi
       ;wxListMainWindow::ChangeCurrent(unsigned int)
       ChangeCurrent__16wxListMainWindowFUi
-      ;wxListCtrl::Arrange(int)
-      Arrange__10wxListCtrlFi
-      ;wxListCtrl::GetNextItem(long,int,int) const
-      GetNextItem__10wxListCtrlCFliT2
+      ;wxGenericListCtrl::~wxGenericListCtrl()
+      __dt__17wxGenericListCtrlFv
       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv
       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv
+      ;wxConstructorForwxGenericListCtrl()
+      wxConstructorForwxGenericListCtrl__Fv
       __vft16wxListMainWindow14wxScrollHelper
       ;wxListMainWindow::UpdateCurrent()
       UpdateCurrent__16wxListMainWindowFv
       ;wxListMainWindow::Thaw()
       Thaw__16wxListMainWindowFv
-      ;wxListCtrl::Thaw()
-      Thaw__10wxListCtrlFv
-      ;wxListCtrl::SetItem(long,int,const wxString&,int)
-      SetItem__10wxListCtrlFliRC8wxStringT2
-      ;wxListCtrl::SetItemBackgroundColour(long,const wxColour&)
-      SetItemBackgroundColour__10wxListCtrlFlRC8wxColour
+      ;wxGenericListCtrl::SetItemBackgroundColour(long,const wxColour&)
+      SetItemBackgroundColour__17wxGenericListCtrlFlRC8wxColour
       ;wxListMainWindow::SetFocus()
       SetFocus__16wxListMainWindowFv
       ;wxListMainWindow::InitScrolling()
       InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv
-      ;wxListMainWindow::GetSelectedItemCount()
-      GetSelectedItemCount__16wxListMainWindowFv
+      ;wxGenericListCtrl::GetSelectedItemCount() const
+      GetSelectedItemCount__17wxGenericListCtrlCFv
       ;wxListMainWindow::GetLineHeight() const
       GetLineHeight__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetItemCount() const
+      GetItemCount__17wxGenericListCtrlCFv
       ;wxListMainWindow::GetItemCount() const
       GetItemCount__16wxListMainWindowCFv
       ;wxListItemData::GetHeight() const
       GetHeight__14wxListItemDataCFv
       ;wxListHeaderData::GetFormat() const
       GetFormat__16wxListHeaderDataCFv
-      ;wxListCtrl::GetEventTable() const
-      GetEventTable__10wxListCtrlCFv
-      ;wxListCtrl::GetCountPerPage() const
-      GetCountPerPage__10wxListCtrlCFv
-      ;wxListCtrl::GetBackgroundColour() const
-      GetBackgroundColour__10wxListCtrlCFv
       ;wxListLineData::GetAttr() const
       GetAttr__14wxListLineDataCFv
+      ;wxGenericListCtrl::Freeze()
+      Freeze__17wxGenericListCtrlFv
       ;wxListMainWindow::Freeze()
       Freeze__16wxListMainWindowFv
-      ;wxListCtrl::CreateHeaderWindow()
-      CreateHeaderWindow__10wxListCtrlFv
-      ;wxListLineData::SetText(int,const wxString)
-      SetText__14wxListLineDataFiC8wxString
+      ;wxGenericListCtrl::DeleteAllItems()
+      DeleteAllItems__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::DeleteAllColumns()
+      DeleteAllColumns__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
+      Create__17wxGenericListCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       wxEVT_COMMAND_LIST_COL_RIGHT_CLICK
       ;wxListMainWindow::sm_eventTable
       sm_eventTable__16wxListMainWindow
       ;wxListHeaderWindow::sm_classwxListHeaderWindow
       sm_classwxListHeaderWindow__18wxListHeaderWindow
-      ;wxListCtrl::SetItemText(long,const wxString&)
-      SetItemText__10wxListCtrlFlRC8wxString
-      ;wxListCtrl::InsertItem(long,const wxString&)
-      InsertItem__10wxListCtrlFlRC8wxString
+      ;wxListLineData::SetText(int,const wxString)
+      SetText__14wxListLineDataFiC8wxString
       ;wxListLineData::Draw(wxDC*)
       Draw__14wxListLineDataFP4wxDC
+      ;wxGenericListCtrl::EnsureVisible(long)
+      EnsureVisible__17wxGenericListCtrlFl
+      ;wxGenericListCtrl::sm_classwxGenericListCtrl
+      sm_classwxGenericListCtrl__17wxGenericListCtrl
+      __vft17wxGenericListCtrl8wxObject
+      __vft16wxListMainWindow8wxObject
       ;wxListLineData::SetAttributes(wxDC*,const wxListItemAttr*,unsigned long)
       SetAttributes__14wxListLineDataFP4wxDCPC14wxListItemAttrUl
-      ;wxListCtrl::sm_eventTable
-      sm_eventTable__10wxListCtrl
-      __vft16wxListMainWindow8wxObject
-      ;wxListCtrl::SetFont(const wxFont&)
-      SetFont__10wxListCtrlFRC6wxFont
       ;wxListHeaderWindow::SendListEvent(int,wxPoint)
       SendListEvent__18wxListHeaderWindowFi7wxPoint
-      ;wxListCtrl::ResizeReportView(unsigned long)
-      ResizeReportView__10wxListCtrlFUl
+      ;wxGenericListCtrl::ResizeReportView(unsigned long)
+      ResizeReportView__17wxGenericListCtrlFUl
       ;wxListMainWindow::OnSetFocus(wxFocusEvent&)
       OnSetFocus__16wxListMainWindowFR12wxFocusEvent
       ;wxListMainWindow::OnKillFocus(wxFocusEvent&)
       OnKillFocus__16wxListMainWindowFR12wxFocusEvent
-      ;wxListCtrl::OnGetItemImage(long) const
-      OnGetItemImage__10wxListCtrlCFl
-      ;wxListCtrl::OnGetItemAttr(long) const
-      OnGetItemAttr__10wxListCtrlCFl
+      ;wxGenericListCtrl::OnGetItemImage(long) const
+      OnGetItemImage__17wxGenericListCtrlCFl
       ;wxListLineData::Highlight(unsigned long)
       Highlight__14wxListLineDataFUl
       ;wxListMainWindow::HighlightLines(unsigned int,unsigned int,unsigned long)
       HighlightLines__16wxListMainWindowFUiT1Ul
+      ;wxGenericListCtrl::GetItemSpacing(unsigned long) const
+      GetItemSpacing__17wxGenericListCtrlCFUl
       ;wxListMainWindow::GetItemSpacing(unsigned long)
       GetItemSpacing__16wxListMainWindowFUl
-      ;wxListMainWindow::GetItemPosition(long,wxPoint&)
-      GetItemPosition__16wxListMainWindowFlR7wxPoint
-      ;wxListCtrl::GetItemPosition(long,wxPoint&) const
-      GetItemPosition__10wxListCtrlCFlR7wxPoint
       ;wxListMainWindow::FindItem(long,const wxString&,unsigned long)
       FindItem__16wxListMainWindowFlRC8wxStringUl
       ;wxListMainWindow::EditLabel(long)
       EditLabel__16wxListMainWindowFl
-      ;wxListCtrl::DeleteItem(long)
-      DeleteItem__10wxListCtrlFl
-      ;wxListCtrl::GetItemState(long,long) const
-      GetItemState__10wxListCtrlCFlT1
+      ;wxGenericListCtrl::SetItemState(long,long,long)
+      SetItemState__17wxGenericListCtrlFlN21
       wxEVT_COMMAND_LIST_DELETE_ITEM
-      ;wxListCtrl::SetColumn(int,wxListItem&)
-      SetColumn__10wxListCtrlFiR10wxListItem
-      ;wxListCtrl::RefreshItems(long,long)
-      RefreshItems__10wxListCtrlFlT1
+      ;wxGenericListCtrl::SetItemData(long,long)
+      SetItemData__17wxGenericListCtrlFlT1
       ;wxListMainWindow::RefreshAfter(unsigned int)
       RefreshAfter__16wxListMainWindowFUi
+      ;wxGenericListCtrl::InsertItem(long,const wxString&,int)
+      InsertItem__17wxGenericListCtrlFlRC8wxStringi
       ;wxListLineData::InitItems(int)
       InitItems__14wxListLineDataFi
       ;wxListMainWindow::GetLineY(unsigned int) const
       GetLineY__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineHighlightRect(unsigned int) const
       GetLineHighlightRect__16wxListMainWindowCFUi
+      ;wxGenericListCtrl::GetItem(wxListItem&) const
+      GetItem__17wxGenericListCtrlCFR10wxListItem
+      ;wxListMainWindow::GetItem(wxListItem&) const
+      GetItem__16wxListMainWindowCFR10wxListItem
       ;wxListHeaderData::GetItem(wxListItem&)
       GetItem__16wxListHeaderDataFR10wxListItem
       ;wxListLineData::GetItem(int,wxListItem&)
       GetItem__14wxListLineDataFiR10wxListItem
+      ;wxGenericListCtrl::GetItemRect(long,wxRect&,int) const
+      GetItemRect__17wxGenericListCtrlCFlR6wxRecti
       ;wxListLineData::GetImage(int) const
       GetImage__14wxListLineDataCFi
-      ;wxListCtrl::GetImageList(int) const
-      GetImageList__10wxListCtrlCFi
-      ;wxListCtrl::GetColumn(int,wxListItem&) const
-      GetColumn__10wxListCtrlCFiR10wxListItem
+      ;wxGenericListCtrl::FindItem(long,long)
+      FindItem__17wxGenericListCtrlFlT1
       ;wxListLineDataArray::DoCopy(const wxListLineDataArray&)
       DoCopy__19wxListLineDataArrayFRC19wxListLineDataArray
       ;wxListMainWindow::DeleteColumn(int)
       DeleteColumn__16wxListMainWindowFi
       ;wxListLineData::CalculateSize(wxDC*,int)
       CalculateSize__14wxListLineDataFP4wxDCi
-      ;wxListCtrl::~wxListCtrl()
-      __dt__10wxListCtrlFv
+      ;wxGenericListCtrl::Arrange(int)
+      Arrange__17wxGenericListCtrlFi
+      ;wxGenericListCtrl::wxGenericListCtrl()
+      __ct__17wxGenericListCtrlFv
       wxSizeTCmpFn
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv
@@ -9457,52 +9586,55 @@ EXPORTS
       __dt__19wxListLineDataArrayFv
       ;wxListItemData::~wxListItemData()
       __dt__14wxListItemDataFv
-      ;wxListCtrl::SetItemImage(long,int,int)
-      SetItemImage__10wxListCtrlFliT2
-      ;wxListCtrl::SetForegroundColour(const wxColour&)
-      SetForegroundColour__10wxListCtrlFRC8wxColour
+      ;wxGenericListCtrl::SetItemTextColour(long,const wxColour&)
+      SetItemTextColour__17wxGenericListCtrlFlRC8wxColour
+      ;wxGenericListCtrl::SetCursor(const wxCursor&)
+      SetCursor__17wxGenericListCtrlFRC8wxCursor
       ;wxListMainWindow::Init()
       Init__16wxListMainWindowFv
       ;wxListHeaderData::Init()
       Init__16wxListHeaderDataFv
-      ;wxListCtrl::GetSelectedItemCount() const
-      GetSelectedItemCount__10wxListCtrlCFv
+      ;wxListMainWindow::GetSelectedItemCount() const
+      GetSelectedItemCount__16wxListMainWindowCFv
       ;wxListHeaderWindow::GetEventTable() const
       GetEventTable__18wxListHeaderWindowCFv
       ;wxListMainWindow::GetDummyLine() const
       GetDummyLine__16wxListMainWindowCFv
-      ;wxListCtrl::GetDropTarget() const
-      GetDropTarget__10wxListCtrlCFv
-      ;wxListCtrl::GetColumnCount() const
-      GetColumnCount__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetColumnCount() const
+      GetColumnCount__17wxGenericListCtrlCFv
+      ;wxGenericListCtrl::GetBackgroundColour() const
+      GetBackgroundColour__17wxGenericListCtrlCFv
+      ;wxListTextCtrl::Finish()
+      Finish__14wxListTextCtrlFv
       ;wxListMainWindow::DeleteEverything()
       DeleteEverything__16wxListMainWindowFv
       ;wxwxListHeaderDataListNode::DeleteData()
       DeleteData__26wxwxListHeaderDataListNodeFv
       ;wxListMainWindow::DeleteAllItems()
       DeleteAllItems__16wxListMainWindowFv
-      ;wxListCtrl::DeleteAllColumns()
-      DeleteAllColumns__10wxListCtrlFv
-      ;wxListCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
-      Create__10wxListCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      ;wxGenericListCtrl::CreateHeaderWindow()
+      CreateHeaderWindow__17wxGenericListCtrlFv
+      ;wxListTextCtrl::AcceptChanges()
+      AcceptChanges__14wxListTextCtrlFv
+      ;wxListMainWindow::GetTextLength(const wxString&) const
+      GetTextLength__16wxListMainWindowCFRC8wxString
       wxEVT_COMMAND_LIST_GET_INFO
       ;wxListMainWindow::sm_eventTableEntries
       sm_eventTableEntries__16wxListMainWindow
-      ;wxListMainWindow::GetTextLength(const wxString&) const
-      GetTextLength__16wxListMainWindowCFRC8wxString
-      ;wxListCtrl::EnsureVisible(long)
-      EnsureVisible__10wxListCtrlFl
+      ;wxGenericListCtrl::InsertItem(long,const wxString&)
+      InsertItem__17wxGenericListCtrlFlRC8wxString
+      ;wxListMainWindow::HighlightLine(unsigned int,unsigned long)
+      HighlightLine__16wxListMainWindowFUiUl
       wxEVT_COMMAND_LIST_ITEM_SELECTED
       wxEVT_COMMAND_LIST_END_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__14wxListTextCtrl
-      ;wxListTextCtrl::sm_classwxListTextCtrl
-      sm_classwxListTextCtrl__14wxListTextCtrl
-      __vft10wxListCtrl8wxObject
-      ;wxListCtrl::SetWindowStyleFlag(long)
-      SetWindowStyleFlag__10wxListCtrlFl
-      ;wxListCtrl::RefreshItem(long)
-      RefreshItem__10wxListCtrlFl
+      ;wxGenericListCtrl::SetFont(const wxFont&)
+      SetFont__17wxGenericListCtrlFRC6wxFont
+      ;wxGenericListCtrl::SetDropTarget(wxDropTarget*)
+      SetDropTarget__17wxGenericListCtrlFP12wxDropTarget
+      ;wxGenericListCtrl::OnSize(wxSizeEvent&)
+      OnSize__17wxGenericListCtrlFR11wxSizeEvent
       ;wxListMainWindow::OnScroll(wxScrollWinEvent&)
       OnScroll__16wxListMainWindowFR16wxScrollWinEvent
       ;wxListHeaderWindow::OnPaint(wxPaintEvent&)
@@ -9513,18 +9645,20 @@ EXPORTS
       OnKeyUp__14wxListTextCtrlFR10wxKeyEvent
       ;wxListMainWindow::OnChar(wxKeyEvent&)
       OnChar__16wxListMainWindowFR10wxKeyEvent
-      ;wxListMainWindow::HighlightLine(unsigned int,unsigned long)
-      HighlightLine__16wxListMainWindowFUiUl
-      ;wxListCtrl::GetItemText(long) const
-      GetItemText__10wxListCtrlCFl
-      ;wxListCtrl::GetItemSpacing(unsigned long) const
-      GetItemSpacing__10wxListCtrlCFUl
-      ;wxListCtrl::GetItemData(long) const
-      GetItemData__10wxListCtrlCFl
+      ;wxGenericListCtrl::GetItemTextColour(long) const
+      GetItemTextColour__17wxGenericListCtrlCFl
+      ;wxListMainWindow::GetItemPosition(long,wxPoint&) const
+      GetItemPosition__16wxListMainWindowCFlR7wxPoint
+      ;wxGenericListCtrl::GetItemBackgroundColour(long) const
+      GetItemBackgroundColour__17wxGenericListCtrlCFl
+      ;wxGenericListCtrl::FindItem(long,const wxString&,unsigned long)
+      FindItem__17wxGenericListCtrlFlRC8wxStringUl
       ;wxListMainWindow::EnsureVisible(long)
       EnsureVisible__16wxListMainWindowFl
       ;wxListLineData::DrawInReportMode(wxDC*,const wxRect&,const wxRect&,unsigned long)
       DrawInReportMode__14wxListLineDataFP4wxDCRC6wxRectT2Ul
+      ;wxGenericListCtrl::DeleteItem(long)
+      DeleteItem__17wxGenericListCtrlFl
       ;wxListLineData::GetText(int) const
       GetText__14wxListLineDataCFi
       __vft26wxwxListHeaderDataListNode10wxNodeBase
@@ -9535,54 +9669,38 @@ EXPORTS
       SetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::SetItem(const wxListItem&)
       SetItem__14wxListItemDataFRC10wxListItem
-      ;wxListCtrl::SetItemData(long,long)
-      SetItemData__10wxListCtrlFlT1
-      ;wxListCtrl::SetImageList(wxImageList*,int)
-      SetImageList__10wxListCtrlFP11wxImageListi
+      ;wxGenericListCtrl::SetImageList(wxImageList*,int)
+      SetImageList__17wxGenericListCtrlFP11wxImageListi
       ;wxListMainWindow::SetColumn(int,wxListItem&)
       SetColumn__16wxListMainWindowFiR10wxListItem
-      ;wxListCtrl::ScrollList(int,int)
-      ScrollList__10wxListCtrlFiT1
       ;wxListLineDataArray::RemoveAt(unsigned int,unsigned int)
       RemoveAt__19wxListLineDataArrayFUiT1
       ;wxSelectionStore::IsSelected(unsigned int) const
       IsSelected__16wxSelectionStoreCFUi
       ;wxListMainWindow::IsHighlighted(unsigned int) const
       IsHighlighted__16wxListMainWindowCFUi
+      ;wxGenericListCtrl::InsertItem(wxListItem&)
+      InsertItem__17wxGenericListCtrlFR10wxListItem
       ;wxListMainWindow::InsertItem(wxListItem&)
       InsertItem__16wxListMainWindowFR10wxListItem
-      ;wxListCtrl::InsertItem(long,const wxString&,int)
-      InsertItem__10wxListCtrlFlRC8wxStringi
-      ;wxListCtrl::InsertColumn(long,wxListItem&)
-      InsertColumn__10wxListCtrlFlR10wxListItem
       ;wxListMainWindow::GetLineIconRect(unsigned int) const
       GetLineIconRect__16wxListMainWindowCFUi
-      ;wxListMainWindow::GetItemState(long,long)
-      GetItemState__16wxListMainWindowFlT1
-      ;wxListCtrl::GetItemRect(long,wxRect&,int) const
-      GetItemRect__10wxListCtrlCFlR6wxRecti
+      ;wxListMainWindow::GetItemState(long,long) const
+      GetItemState__16wxListMainWindowCFlT1
       ;wxListMainWindow::GetColumnWidth(int) const
       GetColumnWidth__16wxListMainWindowCFi
-      ;wxListCtrl::GetColumnWidth(int) const
-      GetColumnWidth__10wxListCtrlCFi
-      ;wxListCtrl::FindItem(long,const wxPoint&,int)
-      FindItem__10wxListCtrlFlRC7wxPointi
-      ;wxListCtrl::AssignImageList(wxImageList*,int)
-      AssignImageList__10wxListCtrlFP11wxImageListi
       ;wxListLineDataArray::Add(const wxListLineData&,unsigned int)
       Add__19wxListLineDataArrayFRC14wxListLineDataUi
-      ;wxListCtrl::wxListCtrl()
-      __ct__10wxListCtrlFv
       ;wxConstructorForwxListView()
       wxConstructorForwxListView__Fv
       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__Fv
-      ;wxListTextCtrl::wxListTextCtrl(wxWindow*,const int,unsigned long*,wxString*,wxListMainWindow*,const wxString&,const wxPoint&,const wxSize&,int,const wxValidator&,const wxString&)
-      __ct__14wxListTextCtrlFP8wxWindowCiPUlP8wxStringP16wxListMainWindowRC8wxStringRC7wxPointRC6wxSizeiRC11wxValidatorT6
-      ;wxListCtrl::SetTextColour(const wxColour&)
-      SetTextColour__10wxListCtrlFRC8wxColour
-      ;wxListCtrl::SetBackgroundColour(const wxColour&)
-      SetBackgroundColour__10wxListCtrlFRC8wxColour
+      ;wxGenericListCtrl::SetItemImage(long,int,int)
+      SetItemImage__17wxGenericListCtrlFliT2
+      ;wxGenericListCtrl::SetFocus()
+      SetFocus__17wxGenericListCtrlFv
+      ;wxGenericListCtrl::SetBackgroundColour(const wxColour&)
+      SetBackgroundColour__17wxGenericListCtrlFRC8wxColour
       ;wxListMainWindow::RefreshAll()
       RefreshAll__16wxListMainWindowFv
       ;wxListMainWindow::HitTestLine(unsigned int,int,int) const
@@ -9591,26 +9709,18 @@ EXPORTS
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
       GetWidth__14wxListItemDataCFv
-      ;wxListMainWindow::GetNextItem(long,int,int)
-      GetNextItem__16wxListMainWindowFliT2
       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv
-      ;wxListCtrl::GetForegroundColour() const
-      GetForegroundColour__10wxListCtrlCFv
       ;wxListMainWindow::GetEventTable() const
       GetEventTable__16wxListMainWindowCFv
+      ;wxGenericListCtrl::GetCountPerPage() const
+      GetCountPerPage__17wxGenericListCtrlCFv
       ;wxListMainWindow::GetCountPerPage() const
       GetCountPerPage__16wxListMainWindowCFv
       ;wxListHeaderWindow::DrawCurrent()
       DrawCurrent__18wxListHeaderWindowFv
-      ;wxListCtrl::DoPopupMenu(wxMenu*,int,int)
-      DoPopupMenu__10wxListCtrlFP6wxMenuiT2
       ;wxListLineDataArray::DoEmpty()
       DoEmpty__19wxListLineDataArrayFv
-      ;wxListCtrl::DeleteAllItems()
-      DeleteAllItems__10wxListCtrlFv
-      ;wxListCtrl::ClearAll()
-      ClearAll__10wxListCtrlFv
       ;wxListItemData::wxListItemData(wxListMainWindow*)
       __ct__14wxListItemDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_COL_END_DRAG
@@ -9706,6 +9816,141 @@ EXPORTS
       __ct__10wxLogFrameFP7wxFrameP11wxLogWindowPCc
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)
       __ct__11wxLogWindowFP7wxFramePCcUlT3
+  ;From object file:  ..\generic\mdig.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxGenericMDIClientWindow::CreateClient(wxGenericMDIParentFrame*,long)
+      CreateClient__24wxGenericMDIClientWindowFP23wxGenericMDIParentFramel
+      ;wxGenericMDIChildFrame::DoMoveWindow(int,int,int,int)
+      DoMoveWindow__22wxGenericMDIChildFrameFiN31
+      ;wxConstructorForwxGenericMDIParentFrame()
+      wxConstructorForwxGenericMDIParentFrame__Fv
+      ;wxGenericMDIParentFrame::RemoveWindowMenu(wxMenuBar*)
+      RemoveWindowMenu__23wxGenericMDIParentFrameFP9wxMenuBar
+      ;wxGenericMDIParentFrame::OnCreateClient()
+      OnCreateClient__23wxGenericMDIParentFrameFv
+      ;wxGenericMDIParentFrame::ActivatePrevious()
+      ActivatePrevious__23wxGenericMDIParentFrameFv
+      ;wxGenericMDIParentFrame::ActivateNext()
+      ActivateNext__23wxGenericMDIParentFrameFv
+      ;wxMDIClientWindow::sm_classwxMDIClientWindow
+      sm_classwxMDIClientWindow__17wxMDIClientWindow
+      ;wxGenericMDIClientWindow::sm_eventTable
+      sm_eventTable__24wxGenericMDIClientWindow
+      ;wxGenericMDIClientWindow::wxGenericMDIClientWindow(wxGenericMDIParentFrame*,long)
+      __ct__24wxGenericMDIClientWindowFP23wxGenericMDIParentFramel
+      __vft24wxGenericMDIClientWindow8wxObject
+      ;wxGenericMDIClientWindow::OnPageChanged(wxNotebookEvent&)
+      OnPageChanged__24wxGenericMDIClientWindowFR15wxNotebookEvent
+      ;wxGenericMDIParentFrame::SetChildMenuBar(wxGenericMDIChildFrame*)
+      SetChildMenuBar__23wxGenericMDIParentFrameFP22wxGenericMDIChildFrame
+      ;wxGenericMDIChildFrame::sm_eventTableEntries
+      sm_eventTableEntries__22wxGenericMDIChildFrame
+      ;wxMDIParentFrame::sm_classwxMDIParentFrame
+      sm_classwxMDIParentFrame__16wxMDIParentFrame
+      ;wxGenericMDIParentFrame::sm_classwxGenericMDIParentFrame
+      sm_classwxGenericMDIParentFrame__23wxGenericMDIParentFrame
+      ;wxGenericMDIClientWindow::SetSelection(int)
+      SetSelection__24wxGenericMDIClientWindowFi
+      ;wxGenericMDIChildFrame::wxGenericMDIChildFrame()
+      __ct__22wxGenericMDIChildFrameFv
+      ;wxGenericMDIClientWindow::wxGenericMDIClientWindow()
+      __ct__24wxGenericMDIClientWindowFv
+      ;wxGenericMDIParentFrame::SetMenuBar(wxMenuBar*)
+      SetMenuBar__23wxGenericMDIParentFrameFP9wxMenuBar
+      ;wxGenericMDIParentFrame::AddWindowMenu(wxMenuBar*)
+      AddWindowMenu__23wxGenericMDIParentFrameFP9wxMenuBar
+      ;wxGenericMDIParentFrame::ProcessEvent(wxEvent&)
+      ProcessEvent__23wxGenericMDIParentFrameFR7wxEvent
+      __vft23wxGenericMDIParentFrame8wxObject
+      ;wxGenericMDIParentFrame::DoHandleMenu(wxCommandEvent&)
+      DoHandleMenu__23wxGenericMDIParentFrameFR14wxCommandEvent
+      ;wxGenericMDIChildFrame::sm_classwxGenericMDIChildFrame
+      sm_classwxGenericMDIChildFrame__22wxGenericMDIChildFrame
+      ;wxGenericMDIChildFrame::sm_eventTable
+      sm_eventTable__22wxGenericMDIChildFrame
+      ;wxMDIChildFrame::sm_classwxMDIChildFrame
+      sm_classwxMDIChildFrame__15wxMDIChildFrame
+      ;wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
+      __dt__22wxGenericMDIChildFrameFv
+      ;wxGenericMDIClientWindow::~wxGenericMDIClientWindow()
+      __dt__24wxGenericMDIClientWindowFv
+      ;wxGenericMDIChildFrame::SetMenuBar(wxMenuBar*)
+      SetMenuBar__22wxGenericMDIChildFrameFP9wxMenuBar
+      ;wxGenericMDIChildFrame::GetMenuBar() const
+      GetMenuBar__22wxGenericMDIChildFrameCFv
+      ;wxGenericMDIParentFrame::GetActiveChild() const
+      GetActiveChild__23wxGenericMDIParentFrameCFv
+      ;wxGenericMDIChildFrame::Activate()
+      Activate__22wxGenericMDIChildFrameFv
+      ;wxGenericMDIParentFrame::wxGenericMDIParentFrame(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      __ct__23wxGenericMDIParentFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
+      ;wxGenericMDIClientWindow::sm_classwxGenericMDIClientWindow
+      sm_classwxGenericMDIClientWindow__24wxGenericMDIClientWindow
+      ;wxGenericMDIChildFrame::OnSize(wxSizeEvent&)
+      OnSize__22wxGenericMDIChildFrameFR11wxSizeEvent
+      __vft22wxGenericMDIChildFrame8wxObject
+      ;wxGenericMDIClientWindow::OnSize(wxSizeEvent&)
+      OnSize__24wxGenericMDIClientWindowFR11wxSizeEvent
+      ;wxGenericMDIChildFrame::OnCloseWindow(wxCloseEvent&)
+      OnCloseWindow__22wxGenericMDIChildFrameFR12wxCloseEvent
+      ;wxGenericMDIParentFrame::SetWindowMenu(wxMenu*)
+      SetWindowMenu__23wxGenericMDIParentFrameFP6wxMenu
+      ;wxGenericMDIParentFrame::sm_eventTableEntries
+      sm_eventTableEntries__23wxGenericMDIParentFrame
+      ;wxGenericMDIChildFrame::SetMDIParentFrame(wxGenericMDIParentFrame*)
+      SetMDIParentFrame__22wxGenericMDIChildFrameFP23wxGenericMDIParentFrame
+      ;wxGenericMDIParentFrame::DoGetClientSize(int*,int*) const
+      DoGetClientSize__23wxGenericMDIParentFrameCFPiT1
+      ;wxGenericMDIParentFrame::wxGenericMDIParentFrame()
+      __ct__23wxGenericMDIParentFrameFv
+      ;wxConstructorForwxGenericMDIClientWindow()
+      wxConstructorForwxGenericMDIClientWindow__Fv
+      ;wxConstructorForwxGenericMDIChildFrame()
+      wxConstructorForwxGenericMDIChildFrame__Fv
+      ;wxGenericMDIParentFrame::Init()
+      Init__23wxGenericMDIParentFrameFv
+      ;wxGenericMDIChildFrame::GetMDIParentFrame() const
+      GetMDIParentFrame__22wxGenericMDIChildFrameCFv
+      ;wxGenericMDIClientWindow::GetEventTable() const
+      GetEventTable__24wxGenericMDIClientWindowCFv
+      ;wxGenericMDIParentFrame::GetEventTable() const
+      GetEventTable__23wxGenericMDIParentFrameCFv
+      ;wxGenericMDIParentFrame::GetClientWindow() const
+      GetClientWindow__23wxGenericMDIParentFrameCFv
+      ;wxGenericMDIChildFrame::Create(wxGenericMDIParentFrame*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__22wxGenericMDIChildFrameFP23wxGenericMDIParentFrameiRC8wxStringRC7wxPointRC6wxSizelT3
+      ;wxGenericMDIChildFrame::OnMenuHighlight(wxMenuEvent&)
+      OnMenuHighlight__22wxGenericMDIChildFrameFR11wxMenuEvent
+      ;wxGenericMDIChildFrame::OnActivate(wxActivateEvent&)
+      OnActivate__22wxGenericMDIChildFrameFR15wxActivateEvent
+      ;wxGenericMDIClientWindow::PageChanged(int,int)
+      PageChanged__24wxGenericMDIClientWindowFiT1
+      ;wxGenericMDIParentFrame::sm_eventTable
+      sm_eventTable__23wxGenericMDIParentFrame
+      ;wxGenericMDIParentFrame::~wxGenericMDIParentFrame()
+      __dt__23wxGenericMDIParentFrameFv
+      ;wxConstructorForwxMDIParentFrame()
+      wxConstructorForwxMDIParentFrame__Fv
+      ;wxConstructorForwxMDIClientWindow()
+      wxConstructorForwxMDIClientWindow__Fv
+      ;wxConstructorForwxMDIChildFrame()
+      wxConstructorForwxMDIChildFrame__Fv
+      ;wxGenericMDIChildFrame::Init()
+      Init__22wxGenericMDIChildFrameFv
+      ;wxGenericMDIChildFrame::GetTitle() const
+      GetTitle__22wxGenericMDIChildFrameCFv
+      ;wxGenericMDIChildFrame::GetEventTable() const
+      GetEventTable__22wxGenericMDIChildFrameCFv
+      ;wxGenericMDIChildFrame::ApplyMDIChildFrameRect()
+      ApplyMDIChildFrameRect__22wxGenericMDIChildFrameFv
+      ;wxGenericMDIChildFrame::wxGenericMDIChildFrame(wxGenericMDIParentFrame*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      __ct__22wxGenericMDIChildFrameFP23wxGenericMDIParentFrameiRC8wxStringRC7wxPointRC6wxSizelT3
+      ;wxGenericMDIClientWindow::sm_eventTableEntries
+      sm_eventTableEntries__24wxGenericMDIClientWindow
+      ;wxGenericMDIChildFrame::SetTitle(const wxString&)
+      SetTitle__22wxGenericMDIChildFrameFRC8wxString
+      ;wxGenericMDIParentFrame::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__23wxGenericMDIParentFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
   ;From object file:  ..\generic\numdlgg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGetNumberFromUser(const wxString&,const wxString&,const wxString&,long,long,long,wxWindow*,const wxPoint&)
@@ -9802,8 +10047,6 @@ EXPORTS
       OnOK__20wxGenericPrintDialogFR14wxCommandEvent
       ;wxGenericPrintDialog::wxGenericPrintDialog(wxWindow*,wxPrintDialogData*)
       __ct__20wxGenericPrintDialogFP8wxWindowP17wxPrintDialogData
-      ;wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow*,wxPrintSetupData*)
-      __ct__25wxGenericPrintSetupDialogFP8wxWindowP16wxPrintSetupData
       ;wxGenericPrintDialog::ShowModal()
       ShowModal__20wxGenericPrintDialogFv
       ;wxGenericPageSetupDialog::TransferDataFromWindow()
@@ -9971,6 +10214,8 @@ EXPORTS
       GetScrollPixelsPerUnit__14wxScrollHelperCFPiT1
       ;wxScrollHelper::Scroll(int,int)
       Scroll__14wxScrollHelperFiT1
+      ;wxGenericScrolledWindow::DoSetVirtualSize(int,int)
+      DoSetVirtualSize__23wxGenericScrolledWindowFiT1
       ;wxScrollHelper::~wxScrollHelper()
       __dt__14wxScrollHelperFv
       ;wxConstructorForwxGenericScrolledWindow()
@@ -10130,14 +10375,20 @@ EXPORTS
       OnUnsplit__16wxSplitterWindowFP8wxWindow
   ;From object file:  ..\generic\statusbr.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxStatusBar::OnRightDown(wxMouseEvent&)
+      OnRightDown__11wxStatusBarFR12wxMouseEvent
       ;wxStatusBar::GetFieldRect(int,wxRect&) const
       GetFieldRect__11wxStatusBarCFiR6wxRect
+      ;wxStatusBar::OnLeftDown(wxMouseEvent&)
+      OnLeftDown__11wxStatusBarFR12wxMouseEvent
       ;wxStatusBar::SetStatusWidths(int,const int*)
       SetStatusWidths__11wxStatusBarFiPCi
       ;wxStatusBar::DrawField(wxDC&,int)
       DrawField__11wxStatusBarFR4wxDCi
       ;wxStatusBar::DrawFieldText(wxDC&,int)
       DrawFieldText__11wxStatusBarFR4wxDCi
+      ;wxStatusBar::Init()
+      Init__11wxStatusBarFv
       ;wxStatusBar::InitColours()
       InitColours__11wxStatusBarFv
       ;wxStatusBar::Create(wxWindow*,int,long,const wxString&)
@@ -10163,8 +10414,6 @@ EXPORTS
       sm_eventTable__11wxStatusBar
       ;wxStatusBar::sm_eventTableEntries
       sm_eventTableEntries__11wxStatusBar
-      ;wxStatusBar::wxStatusBar()
-      __ct__11wxStatusBarFv
   ;From object file:  ..\generic\tabg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTabControl::OnDraw(wxDC&,unsigned long)
@@ -10439,6 +10688,8 @@ EXPORTS
       DeleteChildren__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Collapse(const wxTreeItemId&)
       Collapse__17wxGenericTreeCtrlFRC12wxTreeItemId
+      ;wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem*)
+      OnRenameCancelled__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxGenericTreeCtrl::SetSpacing(unsigned int)
       SetSpacing__17wxGenericTreeCtrlFUi
       ;wxGenericTreeCtrl::PrependItem(const wxTreeItemId&,const wxString&,int,int,wxTreeItemData*)
@@ -10485,6 +10736,8 @@ EXPORTS
       GetNextChild__17wxGenericTreeCtrlCFRC12wxTreeItemIdRl
       ;wxGenericTreeCtrl::GetItemText(const wxTreeItemId&) const
       GetItemText__17wxGenericTreeCtrlCFRC12wxTreeItemId
+      ;wxGenericTreeCtrl::GetItemBackgroundColour(const wxTreeItemId&) const
+      GetItemBackgroundColour__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetFirstChild(const wxTreeItemId&,long&) const
       GetFirstChild__17wxGenericTreeCtrlCFRC12wxTreeItemIdRl
       ;wxGenericTreeCtrl::GetChildrenCount(const wxTreeItemId&,unsigned long)
@@ -10499,6 +10752,8 @@ EXPORTS
       AssignButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi
+      ;wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl*,wxGenericTreeItem*)
+      __ct__14wxTreeTextCtrlFP17wxGenericTreeCtrlP17wxGenericTreeItem
       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon
       ;wxGenericTreeItem::~wxGenericTreeItem()
@@ -10507,8 +10762,6 @@ EXPORTS
       Unselect__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour
-      ;wxGenericTreeCtrl::OnRenameAccept()
-      OnRenameAccept__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::GetEventTable() const
       GetEventTable__17wxGenericTreeCtrlCFv
       ;wxGenericTreeItem::GetCurrentImage() const
@@ -10517,6 +10770,8 @@ EXPORTS
       DeleteAllItems__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::CalculatePositions()
       CalculatePositions__17wxGenericTreeCtrlFv
+      ;wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem*,const wxString&)
+      OnRenameAccept__17wxGenericTreeCtrlFP17wxGenericTreeItemRC8wxString
       ;wxGenericTreeCtrl::SetItemText(const wxTreeItemId&,const wxString&)
       SetItemText__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxString
       ;wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId&) const
@@ -10544,6 +10799,8 @@ EXPORTS
       GetPrevSibling__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetLastChild(const wxTreeItemId&) const
       GetLastChild__17wxGenericTreeCtrlCFRC12wxTreeItemId
+      ;wxGenericTreeCtrl::GetItemTextColour(const wxTreeItemId&) const
+      GetItemTextColour__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::Expand(const wxTreeItemId&)
       Expand__17wxGenericTreeCtrlFRC12wxTreeItemId
       ;wxGenericTreeItem::DeleteChildren(wxGenericTreeCtrl*)
@@ -10570,14 +10827,14 @@ EXPORTS
       AddRoot__17wxGenericTreeCtrlFRC8wxStringiT2P14wxTreeItemData
       ;wxGenericTreeCtrl::Init()
       Init__17wxGenericTreeCtrlFv
-      ;wxTreeTextCtrl::wxTreeTextCtrl(wxWindow*,const int,unsigned long*,wxString*,wxGenericTreeCtrl*,const wxString&,const wxPoint&,const wxSize&,int,const wxValidator&,const wxString&)
-      __ct__14wxTreeTextCtrlFP8wxWindowCiPUlP8wxStringP17wxGenericTreeCtrlRC8wxStringRC7wxPointRC6wxSizeiRC11wxValidatorT6
       ;wxGenericTreeCtrl::SetItemImage(const wxTreeItemId&,int,wxTreeItemIcon)
       SetItemImage__17wxGenericTreeCtrlFRC12wxTreeItemIdi14wxTreeItemIcon
       ;wxGenericTreeCtrl::SelectItem(const wxTreeItemId&,unsigned long,unsigned long)
       SelectItem__17wxGenericTreeCtrlFRC12wxTreeItemIdUlT2
       ;wxGenericTreeCtrl::GetButtonsImageList() const
       GetButtonsImageList__17wxGenericTreeCtrlCFv
+      ;wxTreeTextCtrl::AcceptChanges()
+      AcceptChanges__14wxTreeTextCtrlFv
       ;wxGenericTreeCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__17wxGenericTreeCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxGenericTreeCtrl::PaintItem(wxGenericTreeItem*,wxDC&)
@@ -10593,6 +10850,8 @@ EXPORTS
       SetWindowStyle__17wxGenericTreeCtrlFCl
       ;wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId&) const
       GetNextVisible__17wxGenericTreeCtrlCFRC12wxTreeItemId
+      ;wxGenericTreeCtrl::GetItemFont(const wxTreeItemId&) const
+      GetItemFont__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::GetItemData(const wxTreeItemId&) const
       GetItemData__17wxGenericTreeCtrlCFRC12wxTreeItemId
       ;wxGenericTreeCtrl::EnsureVisible(const wxTreeItemId&)
@@ -10620,6 +10879,8 @@ EXPORTS
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv
+      ;wxTreeTextCtrl::Finish()
+      Finish__14wxTreeTextCtrlFv
       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp
@@ -10681,14 +10942,15 @@ EXPORTS
       LoadFile__20wxHtmlHelpControllerFRC8wxString
   ;From object file:  ..\html\helpdata.cpp
     ;PUBDEFs (Symbols available from object file):
+      __vft18wxHtmlSearchEngine8wxObject
       ;wxHtmlBookRecArray::Add(const wxHtmlBookRecord&,unsigned int)
       Add__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUi
       ;wxHtmlBookRecArray::RemoveAt(unsigned int,unsigned int)
       RemoveAt__18wxHtmlBookRecArrayFUiT1
       ;wxHtmlHelpData::wxHtmlHelpData()
       __ct__14wxHtmlHelpDataFv
-      ;wxSearchEngine::LookFor(const wxString&,unsigned long,unsigned long)
-      LookFor__14wxSearchEngineFRC8wxStringUlT2
+      ;wxHtmlSearchEngine::LookFor(const wxString&,unsigned long,unsigned long)
+      LookFor__18wxHtmlSearchEngineFRC8wxStringUlT2
       ;HP_TagHandler::HandleTag(const wxHtmlTag&)
       HandleTag__13HP_TagHandlerFRC9wxHtmlTag
       ;wxHtmlBookRecArray::Index(const wxHtmlBookRecord&,unsigned long) const
@@ -10703,14 +10965,14 @@ EXPORTS
       __ct__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
       WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi
+      ;wxHtmlSearchEngine::Scan(const wxFSFile&)
+      Scan__18wxHtmlSearchEngineFRC8wxFSFile
       ;wxHtmlBookRecArray::DoEmpty()
       DoEmpty__18wxHtmlBookRecArrayFv
       ;wxHtmlBookRecArray::Insert(const wxHtmlBookRecord&,unsigned int,unsigned int)
       Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUiT2
       ;wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord*,wxOutputStream*)
       SaveCachedBook__14wxHtmlHelpDataFP16wxHtmlBookRecordP14wxOutputStream
-      ;wxSearchEngine::Scan(wxInputStream*)
-      Scan__14wxSearchEngineFP13wxInputStream
       ;wxHtmlHelpData::FindPageById(int)
       FindPageById__14wxHtmlHelpDataFi
       ;wxConstructorForwxHtmlHelpData()
@@ -10721,7 +10983,6 @@ EXPORTS
       GetFullPath__16wxHtmlBookRecordCFRC8wxString
       ;wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord*,wxFileSystem&,const wxString&,const wxString&)
       LoadMSProject__14wxHtmlHelpDataFP16wxHtmlBookRecordR12wxFileSystemRC8wxStringT3
-      __vft14wxSearchEngine8wxObject
       ;wxHtmlBookRecArray::DoCopy(const wxHtmlBookRecArray&)
       DoCopy__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
       ;wxHtmlBookRecArray::~wxHtmlBookRecArray()
@@ -10869,6 +11130,8 @@ EXPORTS
       FindCellByPos__10wxHtmlCellCFiT1
       ;wxHtmlWordCell::Draw(wxDC&,int,int,int,int)
       Draw__14wxHtmlWordCellFR4wxDCiN32
+      ;wxHtmlContainerCell::GetBackgroundColour()
+      GetBackgroundColour__19wxHtmlContainerCellFv
       ;wxHtmlContainerCell::Draw(wxDC&,int,int,int,int)
       Draw__19wxHtmlContainerCellFR4wxDCiN32
       ;wxHtmlWidgetCell::Draw(wxDC&,int,int,int,int)
@@ -10916,8 +11179,6 @@ EXPORTS
       wxConstructorForwxHtmlFilterHTML__Fv
       ;wxHtmlFilterHTML::sm_classwxHtmlFilterHTML
       sm_classwxHtmlFilterHTML__16wxHtmlFilterHTML
-      ;wxPrivate_ReadString(wxString&,wxInputStream*)
-      wxPrivate_ReadString__FR8wxStringP13wxInputStream
       ;wxHtmlFilterPlainText::ReadFile(const wxFSFile&) const
       ReadFile__21wxHtmlFilterPlainTextCFRC8wxFSFile
       ;wxHtmlFilterHTML::ReadFile(const wxFSFile&) const
@@ -10952,9 +11213,12 @@ EXPORTS
       DoCopy__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
       ;wxHtmlEntitiesParser::GetEntityChar(const wxString&)
       GetEntityChar__20wxHtmlEntitiesParserFRC8wxString
+      ;wxHtmlParser::ExtractCharsetInformation(const wxString&)
+      ExtractCharsetInformation__12wxHtmlParserFRC8wxString
       ;wxHtmlTextPieces::Index(const wxHtmlTextPiece&,unsigned long) const
       Index__16wxHtmlTextPiecesCFRC15wxHtmlTextPieceUl
       __vft20wxHtmlEntitiesParser8wxObject
+      __vft16wxMetaTagHandler8wxObject
       ;wxHtmlParser::DoParsing()
       DoParsing__12wxHtmlParserFv
       ;wxHtmlParser::RestoreState()
@@ -10965,6 +11229,8 @@ EXPORTS
       __ct__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
       ;wxHtmlParser::SetSource(const wxString&)
       SetSource__12wxHtmlParserFRC8wxString
+      ;wxMetaTagHandler::HandleTag(const wxHtmlTag&)
+      HandleTag__16wxMetaTagHandlerFRC9wxHtmlTag
       ;wxHtmlTextPieces::RemoveAt(unsigned int,unsigned int)
       RemoveAt__16wxHtmlTextPiecesFUiT1
       ;wxHtmlTextPieces::DoEmpty()
@@ -11343,14 +11609,6 @@ EXPORTS
       __ct__18wxHtmlListmarkCellFP4wxDCRC8wxColour
       ;wxHtmlListmarkCell::Draw(wxDC&,int,int,int,int)
       Draw__18wxHtmlListmarkCellFR4wxDCiN32
-  ;From object file:  ..\html\m_meta.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxConstructorForHTML_ModuleMetaTag()
-      wxConstructorForHTML_ModuleMetaTag__Fv
-      ;HTML_ModuleMetaTag::sm_classHTML_ModuleMetaTag
-      sm_classHTML_ModuleMetaTag__18HTML_ModuleMetaTag
-      ;_link_dummy_func_m_meta()
-      _link_dummy_func_m_meta__Fv
   ;From object file:  ..\html\m_pre.cpp
     ;PUBDEFs (Symbols available from object file):
       ;HTML_ModulePre::sm_classHTML_ModulePre
@@ -11500,6 +11758,7 @@ EXPORTS
       sm_classwxApp__5wxApp
       ;wxAppRemoveSocketHandler(int)
       wxAppRemoveSocketHandler__Fi
+      gbInOnIdle
       ;wxAppAddSocketHandler(int,int,void(*)(void*),void*)
       wxAppAddSocketHandler__FiT1PFPv_vPv
       ;wxWakeUpIdle()
@@ -11623,12 +11882,10 @@ EXPORTS
       Create__8wxBitmapFPvliN23
       ;wxBitmap::GetBitmapForDC(wxDC&) const
       GetBitmapForDC__8wxBitmapCFR4wxDC
-      ;wxBitmap::wxBitmap(const wxString&,long)
-      __ct__8wxBitmapFRC8wxStringl
-      ;wxMask::wxMask(const wxBitmap&)
-      __ct__6wxMaskFRC8wxBitmap
       ;wxBitmap::GetSubBitmap(const wxRect&) const
       GetSubBitmap__8wxBitmapCFRC6wxRect
+      ;wxMask::wxMask(const wxBitmap&)
+      __ct__6wxMaskFRC8wxBitmap
       ;wxMask::Create(const wxBitmap&)
       Create__6wxMaskFRC8wxBitmap
       ;wxBitmapHandler::Create(wxBitmap*,void*,long,int,int,int)
@@ -11660,30 +11917,32 @@ EXPORTS
       __ct__8wxBitmapFPCciN22
       ;wxBitmapRefData::wxBitmapRefData()
       __ct__15wxBitmapRefDataFv
+      ;wxBitmapHandler::Load(wxGDIImage*,int,long,int,int)
+      Load__15wxBitmapHandlerFP10wxGDIImageilN22
       ;wxMask::Create(const wxBitmap&,const wxColour&)
       Create__6wxMaskFRC8wxBitmapRC8wxColour
       ;wxBitmap::ConvertToImage() const
       ConvertToImage__8wxBitmapCFv
       ;wxBitmap::wxBitmap(void*,long,int,int,int)
       __ct__8wxBitmapFPvliN23
-      ;wxBitmap::LoadFile(const wxString&,long)
-      LoadFile__8wxBitmapFRC8wxStringl
+      ;wxBitmap::LoadFile(int,long)
+      LoadFile__8wxBitmapFil
       ;wxBitmap::CreateFromImage(const wxImage&,int)
       CreateFromImage__8wxBitmapFRC7wxImagei
       ;wxBitmap::SetPalette(const wxPalette&)
       SetPalette__8wxBitmapFRC9wxPalette
       ;wxBitmapHandler::Save(wxGDIImage*,const wxString&,int)
       Save__15wxBitmapHandlerFP10wxGDIImageRC8wxStringi
-      ;wxBitmapHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
-      LoadFile__15wxBitmapHandlerFP8wxBitmapRC8wxStringUlliT5
       ;wxConstructorForwxBitmapHandler()
       wxConstructorForwxBitmapHandler__Fv
+      ;wxBitmapHandler::LoadFile(wxBitmap*,int,long,int,int)
+      LoadFile__15wxBitmapHandlerFP8wxBitmapilN22
       ;wxBitmapRefData::Free()
       Free__15wxBitmapRefDataFv
+      ;wxBitmap::wxBitmap(int,long)
+      __ct__8wxBitmapFil
       ;wxBitmap::sm_classwxBitmap
       sm_classwxBitmap__8wxBitmap
-      ;wxBitmapHandler::Load(wxGDIImage*,const wxString&,unsigned long,long,int,int)
-      Load__15wxBitmapHandlerFP10wxGDIImageRC8wxStringUlliT5
       ;wxConstructorForwxBitmap()
       wxConstructorForwxBitmap__Fv
       ;wxConstructorForwxMask()
@@ -11694,23 +11953,23 @@ EXPORTS
       SetMask__8wxBitmapFP6wxMask
   ;From object file:  ..\os2\bmpbuttn.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxBitmapButton::DrawFace(unsigned long,int,int,int,int,unsigned long)
-      DrawFace__14wxBitmapButtonFUliN32T1
-      ;wxBitmapButton::SetBitmapLabel(const wxBitmap&)
-      SetBitmapLabel__14wxBitmapButtonFRC8wxBitmap
+      ;wxBitmapButton::OS2OnDraw(void**)
+      OS2OnDraw__14wxBitmapButtonFPPv
+      ;wxBitmapButton::DrawButtonFocus(wxClientDC&)
+      DrawButtonFocus__14wxBitmapButtonFR10wxClientDC
+      ;wxBitmapButton::DrawFace(wxClientDC&,unsigned long)
+      DrawFace__14wxBitmapButtonFR10wxClientDCUl
       __vft14wxBitmapButton8wxObject
-      ;wxBitmapButton::DrawButtonDisable(unsigned long,int,int,int,int,unsigned long)
-      DrawButtonDisable__14wxBitmapButtonFUliN32T1
       ;wxConstructorForwxBitmapButton()
       wxConstructorForwxBitmapButton__Fv
       ;wxBitmapButton::SetDefault()
       SetDefault__14wxBitmapButtonFv
       ;wxBitmapButton::Create(wxWindow*,int,const wxBitmap&,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__14wxBitmapButtonFP8wxWindowiRC8wxBitmapRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      ;wxBitmapButton::DrawButtonDisable(wxClientDC&,wxBitmap&)
+      DrawButtonDisable__14wxBitmapButtonFR10wxClientDCR8wxBitmap
       ;wxBitmapButton::sm_classwxBitmapButton
       sm_classwxBitmapButton__14wxBitmapButton
-      ;wxBitmapButton::DrawButtonFocus(unsigned long,int,int,int,int,unsigned long)
-      DrawButtonFocus__14wxBitmapButtonFUliN32T1
   ;From object file:  ..\os2\brush.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBrush::FreeResource(unsigned long)
@@ -11757,6 +12016,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent
+      ;wxButton::SetDefaultStyle(wxButton*,unsigned long)
+      SetDefaultStyle__8wxButtonFP8wxButtonUl
       ;wxButton::SetTmpDefault()
       SetTmpDefault__8wxButtonFv
       ;wxButton::WindowProc(unsigned int,void*,void*)
@@ -11773,8 +12034,6 @@ EXPORTS
       __dt__8wxButtonFv
       ;wxButton::SendClickEvent()
       SendClickEvent__8wxButtonFv
-      ;wxButton::UpdateDefaultStyle(wxWindow*,wxWindow*)
-      UpdateDefaultStyle__8wxButtonFP8wxWindowT1
       ;wxConstructorForwxButton()
       wxConstructorForwxButton__Fv
       ;wxButton::GetDefaultSize()
@@ -11861,6 +12120,8 @@ EXPORTS
       SetFont__14wxCheckListBoxFRC6wxFont
       ;wxCheckListBox::OnLeftClick(wxMouseEvent&)
       OnLeftClick__14wxCheckListBoxFR12wxMouseEvent
+      ;wxCheckListBox::OS2OnMeasure(void**)
+      OS2OnMeasure__14wxCheckListBoxFPPv
   ;From object file:  ..\os2\choice.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxChoice::DoGetItemClientData(int) const
@@ -12055,27 +12316,20 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxCursor::wxCursor(const wxImage&)
       __ct__8wxCursorFRC7wxImage
-      ;wxCursorRefData::~wxCursorRefData()
-      __dt__15wxCursorRefDataFv
       ;wxCursor::wxCursor(const wxString&,long,int,int)
       __ct__8wxCursorFRC8wxStringliT3
-      __vft8wxCursor8wxObject
       ;wxCursor::wxCursor(int)
       __ct__8wxCursorFi
-      ;wxConstructorForwxCursor()
-      wxConstructorForwxCursor__Fv
       ;wxCursorRefData::wxCursorRefData()
       __ct__15wxCursorRefDataFv
-      ;wxCursor::SetHCURSOR(unsigned long)
-      SetHCURSOR__8wxCursorFUl
+      ;wxConstructorForwxCursor()
+      wxConstructorForwxCursor__Fv
+      ;wxCursorRefData::Free()
+      Free__15wxCursorRefDataFv
       ;wxCursor::sm_classwxCursor
       sm_classwxCursor__8wxCursor
-      ;wxCursor::FreeResource(unsigned long)
-      FreeResource__8wxCursorFUl
       ;wxSetCursor(const wxCursor&)
       wxSetCursor__FRC8wxCursor
-      ;wxCursor::~wxCursor()
-      __dt__8wxCursorFv
       ;wxCursor::wxCursor(const char*,int,int,int,int,const char*)
       __ct__8wxCursorFPCciN32T1
       __vft15wxCursorRefData15wxObjectRefData
@@ -12626,6 +12880,8 @@ EXPORTS
       __ct__12wxFileDialogFP8wxWindowRC8wxStringN32lRC7wxPoint
       ;wxFileDialog::ShowModal()
       ShowModal__12wxFileDialogFv
+      ;wxFileDialog::GetPaths(wxArrayString&) const
+      GetPaths__12wxFileDialogCFR13wxArrayString
       __vft12wxFileDialog8wxObject
       ;wxFileDialog::sm_classwxFileDialog
       sm_classwxFileDialog__12wxFileDialog
@@ -12744,12 +13000,6 @@ EXPORTS
       ;wxConstructorForwxFontDialog()
       wxConstructorForwxFontDialog__Fv
       __vft12wxFontDialog8wxObject
-      ;wxFontDialog::Create(wxWindow*,const wxFontData&)
-      Create__12wxFontDialogFP8wxWindowRC10wxFontData
-      ;wxFontDialog::wxFontDialog(wxWindow*,const wxFontData&)
-      __ct__12wxFontDialogFP8wxWindowRC10wxFontData
-      ;wxFontDialog::wxFontDialog()
-      __ct__12wxFontDialogFv
       ;wxFontDialog::ShowModal()
       ShowModal__12wxFontDialogFv
       ;wxFontDialog::sm_classwxFontDialog
@@ -12783,6 +13033,8 @@ EXPORTS
       wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPUlT3PlR8wxStringP6wxFont
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
+      ;wxConvertVectorFontSize(long,_FATTRS*)
+      wxConvertVectorFontSize__FlP7_FATTRS
       ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
       wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
       ;wxGpiStrcmp(char*,char*)
@@ -12795,6 +13047,8 @@ EXPORTS
       HandleMenuSelect__7wxFrameFUsT1Ul
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv
+      ;wxFrame::SendSizeEvent()
+      SendSizeEvent__7wxFrameFv
       ;wxFrame::HandlePaint()
       HandlePaint__7wxFrameFv
       ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)
@@ -12915,6 +13169,8 @@ EXPORTS
       wxConstructorForwxICOResourceHandler__Fv
       ;wxBMPFileHandler::sm_classwxBMPFileHandler
       sm_classwxBMPFileHandler__16wxBMPFileHandler
+      ;wxBMPResourceHandler::LoadFile(wxBitmap*,int,long,int,int)
+      LoadFile__20wxBMPResourceHandlerFP8wxBitmapilN22
       ;wxGDIImage::CleanUpHandlers()
       CleanUpHandlers__10wxGDIImageFv
       ;wxGDIImage::AddHandler(wxGDIImageHandler*)
@@ -12922,8 +13178,6 @@ EXPORTS
       ;wxGDIImage::FindHandler(long)
       FindHandler__10wxGDIImageFl
       __vft20wxBMPResourceHandler8wxObject
-      ;wxBMPResourceHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
-      LoadFile__20wxBMPResourceHandlerFP8wxBitmapRC8wxStringUlliT5
       ;wxICOResourceHandler::LoadIcon(wxIcon*,const wxString&,unsigned long,long,int,int)
       LoadIcon__20wxICOResourceHandlerFP6wxIconRC8wxStringUlliT5
       ;wxConstructorForwxBMPResourceHandler()
@@ -12978,10 +13232,12 @@ EXPORTS
       _GSocket_Recv_Dgram
       _GSocket_Send_Stream
       GSocket_SetCallback
-      GSocket_GetLocal
+      ;GSocket_close(_GSocket*)
+      GSocket_close__FP8_GSocket
       _GSocket_Input_Timeout
       _GAddress_Init_INET
       GSocket_Read
+      GSocket_GetLocal
       GSocket_Connect
       GAddress_INET_GetPort
       GSocket_destroy
@@ -13277,111 +13533,6 @@ EXPORTS
   ;From object file:  ..\os2\main.cpp
     ;PUBDEFs (Symbols available from object file):
       main
-  ;From object file:  ..\os2\mdi.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__16wxMDIParentFrameFR23wxSysColourChangedEvent
-      ;wxMDIClientWindow::GetEventTable() const
-      GetEventTable__17wxMDIClientWindowCFv
-      ;wxMDIChildFrame::~wxMDIChildFrame()
-      __dt__15wxMDIChildFrameFv
-      ;wxMDIParentFrame::ArrangeIcons()
-      ArrangeIcons__16wxMDIParentFrameFv
-      ;wxMDIParentFrame::ActivatePrevious()
-      ActivatePrevious__16wxMDIParentFrameFv
-      ;wxMDIClientWindow::sm_classwxMDIClientWindow
-      sm_classwxMDIClientWindow__17wxMDIClientWindow
-      ;wxMDIParentFrame::OnSize(wxSizeEvent&)
-      OnSize__16wxMDIParentFrameFR11wxSizeEvent
-      ;wxMDIChildFrame::Maximize(unsigned long)
-      Maximize__15wxMDIChildFrameFUl
-      ;wxMDIClientWindow::CreateClient(wxMDIParentFrame*,long)
-      CreateClient__17wxMDIClientWindowFP16wxMDIParentFramel
-      ;wxMDIChildFrame::DoSetClientSize(int,int)
-      DoSetClientSize__15wxMDIChildFrameFiT1
-      ;wxMDIParentFrame::sm_classwxMDIParentFrame
-      sm_classwxMDIParentFrame__16wxMDIParentFrame
-      ;wxMDIParentFrame::GetEventTable() const
-      GetEventTable__16wxMDIParentFrameCFv
-      ;wxMDIParentFrame::~wxMDIParentFrame()
-      __dt__16wxMDIParentFrameFv
-      ;wxMDIParentFrame::Tile()
-      Tile__16wxMDIParentFrameFv
-      ;wxMDIChildFrame::Restore()
-      Restore__15wxMDIChildFrameFv
-      ;wxMDIParentFrame::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__16wxMDIParentFrameFUiPvT2
-      ;wxMDIParentFrame::OS2TranslateMessage(void**)
-      OS2TranslateMessage__16wxMDIParentFrameFPPv
-      ;wxMDIParentFrame::OS2DefWindowProc(unsigned int,void*,void*)
-      OS2DefWindowProc__16wxMDIParentFrameFUiPvT2
-      ;wxMDIParentFrame::InternalSetMenuBar()
-      InternalSetMenuBar__16wxMDIParentFrameFv
-      ;wxMDIChildFrame::HandleWindowPosChanging(void*)
-      HandleWindowPosChanging__15wxMDIChildFrameFPv
-      ;wxMDIParentFrame::Cascade()
-      Cascade__16wxMDIParentFrameFv
-      ;wxMDIParentFrame::HandleCommand(unsigned short,unsigned short,unsigned long)
-      HandleCommand__16wxMDIParentFrameFUsT1Ul
-      ;wxMDIClientWindow::OnScroll(wxScrollEvent&)
-      OnScroll__17wxMDIClientWindowFR13wxScrollEvent
-      ;wxMDIChildFrame::HandleCommand(unsigned short,unsigned short,unsigned long)
-      HandleCommand__15wxMDIChildFrameFUsT1Ul
-      ;wxMDIChildFrame::sm_classwxMDIChildFrame
-      sm_classwxMDIChildFrame__15wxMDIChildFrame
-      ;wxMDIParentFrame::wxMDIParentFrame()
-      __ct__16wxMDIParentFrameFv
-      ;wxMDIChildFrame::OS2TranslateMessage(void**)
-      OS2TranslateMessage__15wxMDIChildFrameFPPv
-      ;wxMDIChildFrame::InternalSetMenuBar()
-      InternalSetMenuBar__15wxMDIChildFrameFv
-      ;wxMDIParentFrame::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      Create__16wxMDIParentFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
-      __vft16wxMDIParentFrame8wxObject
-      ;wxMDIChildFrame::HandleSize(int,int,unsigned int)
-      HandleSize__15wxMDIChildFrameFiT1Ui
-      ;wxMDIParentFrame::sm_eventTable
-      sm_eventTable__16wxMDIParentFrame
-      ;wxMDIParentFrame::sm_eventTableEntries
-      sm_eventTableEntries__16wxMDIParentFrame
-      ;wxMDIParentFrame::GetActiveChild() const
-      GetActiveChild__16wxMDIParentFrameCFv
-      ;wxMDIParentFrame::OnCreateClient()
-      OnCreateClient__16wxMDIParentFrameFv
-      ;wxMDIChildFrame::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__15wxMDIChildFrameFUiPvT2
-      ;wxMDIChildFrame::OS2DestroyWindow()
-      OS2DestroyWindow__15wxMDIChildFrameFv
-      ;wxMDIParentFrame::HandleActivate(int,unsigned long,unsigned long)
-      HandleActivate__16wxMDIParentFrameFiUlT2
-      ;wxMDIClientWindow::sm_eventTableEntries
-      sm_eventTableEntries__17wxMDIClientWindow
-      __vft15wxMDIChildFrame8wxObject
-      __vft17wxMDIClientWindow8wxObject
-      ;wxMDIChildFrame::DoGetPosition(int*,int*) const
-      DoGetPosition__15wxMDIChildFrameCFPiT1
-      ;wxConstructorForwxMDIParentFrame()
-      wxConstructorForwxMDIParentFrame__Fv
-      ;wxConstructorForwxMDIClientWindow()
-      wxConstructorForwxMDIClientWindow__Fv
-      ;wxConstructorForwxMDIChildFrame()
-      wxConstructorForwxMDIChildFrame__Fv
-      ;wxMDIChildFrame::wxMDIChildFrame()
-      __ct__15wxMDIChildFrameFv
-      ;wxMDIChildFrame::ResetWindowStyle(void*)
-      ResetWindowStyle__15wxMDIChildFrameFPv
-      ;wxMDIChildFrame::OS2DefWindowProc(unsigned int,void*,void*)
-      OS2DefWindowProc__15wxMDIChildFrameFUiPvT2
-      ;wxMDIChildFrame::HandleMDIActivate(long,unsigned long,unsigned long)
-      HandleMDIActivate__15wxMDIChildFrameFlUlT2
-      ;wxMDIChildFrame::Activate()
-      Activate__15wxMDIChildFrameFv
-      ;wxMDIParentFrame::ActivateNext()
-      ActivateNext__16wxMDIParentFrameFv
-      ;wxMDIChildFrame::Create(wxMDIParentFrame*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      Create__15wxMDIChildFrameFP16wxMDIParentFrameiRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxMDIClientWindow::sm_eventTable
-      sm_eventTable__17wxMDIClientWindow
   ;From object file:  ..\os2\menu.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxMenuBar::wxMenuBar(long)
@@ -13555,14 +13706,14 @@ EXPORTS
       GetDescription__14wxFileTypeImplCFP8wxString
       ;wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString&)
       EnumAllFileTypes__22wxMimeTypesManagerImplFR13wxArrayString
+      ;wxFileTypeImpl::GetIcon(wxIcon*,wxString*,int*) const
+      GetIcon__14wxFileTypeImplCFP6wxIconP8wxStringPi
       ;wxFileTypeImpl::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
       GetOpenCommand__14wxFileTypeImplCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxFileTypeImpl::GetPrintCommand(wxString*,const wxFileType::MessageParameters&) const
       GetPrintCommand__14wxFileTypeImplCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString&)
       GetFileTypeFromExtension__22wxMimeTypesManagerImplFRC8wxString
-      ;wxFileTypeImpl::GetIcon(wxIcon*) const
-      GetIcon__14wxFileTypeImplCFP6wxIcon
       ;wxFileTypeImpl::GetCommand(const char*) const
       GetCommand__14wxFileTypeImplCFPCc
       ;wxFileTypeImpl::GetMimeTypes(wxArrayString&) const
@@ -13573,12 +13724,6 @@ EXPORTS
       GetFileTypeFromMimeType__22wxMimeTypesManagerImplFRC8wxString
       ;wxFileTypeImpl::GetExtensions(wxArrayString&)
       GetExtensions__14wxFileTypeImplFR13wxArrayString
-  ;From object file:  ..\os2\minifram.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxMiniFrame::sm_classwxMiniFrame
-      sm_classwxMiniFrame__11wxMiniFrame
-      ;wxConstructorForwxMiniFrame()
-      wxConstructorForwxMiniFrame__Fv
   ;From object file:  ..\os2\msgdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxMessageDialog::ShowModal()
@@ -13616,17 +13761,15 @@ EXPORTS
       DeleteAllPages__10wxNotebookFv
       ;wxNotebook::SetPageText(int,const wxString&)
       SetPageText__10wxNotebookFiRC8wxString
-      ;wxNotebook::AdvanceSelection(unsigned long)
-      AdvanceSelection__10wxNotebookFUl
       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
-      ;wxNotebook::ChangePage(int,int)
-      ChangePage__10wxNotebookFiT1
-      ;wxNotebook::SetTabSize(const wxSize&)
-      SetTabSize__10wxNotebookFRC6wxSize
       ;wxNotebook::SetPageSize(const wxSize&)
       SetPageSize__10wxNotebookFRC6wxSize
+      ;wxNotebook::SetTabSize(const wxSize&)
+      SetTabSize__10wxNotebookFRC6wxSize
       ;wxNotebook::AddPage(wxWindow*,const wxString&,unsigned long,int)
       AddPage__10wxNotebookFP8wxWindowRC8wxStringUli
+      ;wxNotebook::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__10wxNotebookCFlPUl
       ;wxNotebook::OnSize(wxSizeEvent&)
       OnSize__10wxNotebookFR11wxSizeEvent
       ;wxNotebook::SetSelection(int)
@@ -13635,8 +13778,6 @@ EXPORTS
       SetPageImage__10wxNotebookFiT1
       ;wxNotebook::DoPhase(int)
       DoPhase__10wxNotebookFi
-      ;wxNotebook::DeletePage(int)
-      DeletePage__10wxNotebookFi
       ;wxNotebook::GetPageCount() const
       GetPageCount__10wxNotebookCFv
       ;wxNotebook::wxNotebook(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
@@ -13657,8 +13798,6 @@ EXPORTS
       wxConstructorForwxNotebook__Fv
       ;wxConstructorForwxNotebookEvent()
       wxConstructorForwxNotebookEvent__Fv
-      ;wxNotebook::OS2OnNotify(int,void*,void**)
-      OS2OnNotify__10wxNotebookFiPvPPv
       ;wxNotebook::Init()
       Init__10wxNotebookFv
       ;wxNotebook::sm_classwxNotebook
@@ -13666,17 +13805,17 @@ EXPORTS
       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
       ;wxNotebook::sm_eventTable
       sm_eventTable__10wxNotebook
+      ;wxNotebook::OS2OnScroll(int,unsigned short,unsigned short,unsigned long)
+      OS2OnScroll__10wxNotebookFiUsT2Ul
       __vft10wxNotebook8wxObject
       ;wxNotebook::GetPageImage(int) const
       GetPageImage__10wxNotebookCFi
-      ;wxNotebook::RemovePage(int)
-      RemovePage__10wxNotebookFi
       ;wxNotebook::InsertPage(int,wxWindow*,const wxString&,unsigned long,int)
       InsertPage__10wxNotebookFiP8wxWindowRC8wxStringUlT1
+      ;wxNotebook::DoRemovePage(int)
+      DoRemovePage__10wxNotebookFi
       ;wxNotebook::GetEventTable() const
       GetEventTable__10wxNotebookCFv
-      ;wxNotebook::~wxNotebook()
-      __dt__10wxNotebookFv
       ;wxNotebook::GetRowCount() const
       GetRowCount__10wxNotebookCFv
       ;wxNotebook::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
@@ -13776,58 +13915,6 @@ EXPORTS
       __dt__12wxPenRefDataFv
       ;wxPen::SetColour(const wxColour&)
       SetColour__5wxPenFRC8wxColour
-  ;From object file:  ..\os2\pnghand.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxPNGReader::Create(int,int,int,int)
-      Create__11wxPNGReaderFiN31
-      ;wxCopyPalette(const wxPalette*)
-      wxCopyPalette__FPC9wxPalette
-      ;wxPNGFileHandler::SaveFile(wxBitmap*,const wxString&,int,const wxPalette*)
-      SaveFile__16wxPNGFileHandlerFP8wxBitmapRC8wxStringiPC9wxPalette
-      ;wxPNGReader::GetIndex(int,int)
-      GetIndex__11wxPNGReaderFiT1
-      ;wxPNGReader::~wxPNGReader()
-      __dt__11wxPNGReaderFv
-      ;wxPNGReader::ReadFile(char*)
-      ReadFile__11wxPNGReaderFPc
-      ;wxPNGReader::SetRGB(int,int,unsigned char,unsigned char,unsigned char)
-      SetRGB__11wxPNGReaderFiT1UcN23
-      ;wxPNGReader::SetPalette(int,rgb_color_struct*)
-      SetPalette__11wxPNGReaderFiP16rgb_color_struct
-      ;wxPNGReader::InstantiateBitmap(wxBitmap*)
-      InstantiateBitmap__11wxPNGReaderFP8wxBitmap
-      ;wxPNGReader::SetPalette(int,unsigned char*,unsigned char*,unsigned char*)
-      SetPalette__11wxPNGReaderFiPUcN22
-      ;wxConstructorForwxPNGFileHandler()
-      wxConstructorForwxPNGFileHandler__Fv
-      ;wxPNGReader::NullData()
-      NullData__11wxPNGReaderFv
-      ;wxPNGReader::SaveFile(char*)
-      SaveFile__11wxPNGReaderFPc
-      ;wxPNGReader::SetIndex(int,int,int)
-      SetIndex__11wxPNGReaderFiN21
-      ;wxPNGReader::SaveXPM(char*,char*)
-      SaveXPM__11wxPNGReaderFPcT1
-      ;wxPNGFileHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
-      LoadFile__16wxPNGFileHandlerFP8wxBitmapRC8wxStringUlliT5
-      __vft11wxPNGReader
-      ;ima_png_error(png_struct_def*,char*)
-      ima_png_error__FP14png_struct_defPc
-      ;wxPNGReader::wxPNGReader(char*)
-      __ct__11wxPNGReaderFPc
-      ;wxPNGReader::GetRGB(int,int,unsigned char*,unsigned char*,unsigned char*)
-      GetRGB__11wxPNGReaderFiT1PUcN23
-      __vft16wxPNGFileHandler8wxObject
-      ;wxPNGReader::SetPalette(wxPalette*)
-      SetPalette__11wxPNGReaderFP9wxPalette
-      ;wxPNGReader::wxPNGReader()
-      __ct__11wxPNGReaderFv
-      ;wxPNGFileHandler::sm_classwxPNGFileHandler
-      sm_classwxPNGFileHandler__16wxPNGFileHandler
-      ;wxPNGReader::GetBitmap()
-      GetBitmap__11wxPNGReaderFv
-      ;wxPNGReader::CreateMask()
-      CreateMask__11wxPNGReaderFv
   ;From object file:  ..\os2\popupwin.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft13wxPopupWindow8wxObject
@@ -13920,6 +14007,7 @@ EXPORTS
       GetRowCount__10wxRadioBoxCFv
       ;wxRadioBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,int,long,const wxValidator&,const wxString&)
       Create__10wxRadioBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringT2lRC11wxValidatorT3
+      wxRadioBoxWndProc
       ;wxRadioBox::FindString(const wxString&) const
       FindString__10wxRadioBoxCFRC8wxString
       __vft10wxRadioBox8wxObject
@@ -13977,6 +14065,8 @@ EXPORTS
       SetValue__13wxRadioButtonFUl
       ;wxRadioButton::GetValue() const
       GetValue__13wxRadioButtonCFv
+      ;wxRadioButton::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__13wxRadioButtonFUiPvT2
   ;From object file:  ..\os2\region.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)
@@ -14214,6 +14304,8 @@ EXPORTS
       m_svAllSpins__10wxSpinCtrl
       ;wxSpinCtrl::DoGetPosition(int*,int*) const
       DoGetPosition__10wxSpinCtrlCFPiT1
+      ;wxSpinCtrl::SetSelection(long,long)
+      SetSelection__10wxSpinCtrlFlT1
       ;wxSpinCtrl::DoMoveWindow(int,int,int,int)
       DoMoveWindow__10wxSpinCtrlFiN31
       wxSpinCtrlWndProc
@@ -14247,11 +14339,19 @@ EXPORTS
       GetValue__10wxSpinCtrlCFv
   ;From object file:  ..\os2\statbmp.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxStaticBitmap::OnPaint(wxPaintEvent&)
+      OnPaint__14wxStaticBitmapFR12wxPaintEvent
+      ;wxStaticBitmap::sm_eventTable
+      sm_eventTable__14wxStaticBitmap
+      ;wxStaticBitmap::sm_eventTableEntries
+      sm_eventTableEntries__14wxStaticBitmap
       __vft14wxStaticBitmap8wxObject
       ;wxStaticBitmap::Free()
       Free__14wxStaticBitmapFv
       ;wxStaticBitmap::Create(wxWindow*,int,const wxGDIImage&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__14wxStaticBitmapFP8wxWindowiRC10wxGDIImageRC7wxPointRC6wxSizelRC8wxString
+      ;wxStaticBitmap::GetEventTable() const
+      GetEventTable__14wxStaticBitmapCFv
       ;wxStaticBitmap::sm_classwxStaticBitmap
       sm_classwxStaticBitmap__14wxStaticBitmap
       ;wxStaticBitmap::SetImage(const wxGDIImage&)
@@ -14464,6 +14564,8 @@ EXPORTS
       OnRedo__10wxTextCtrlFR14wxCommandEvent
       ;wxTextCtrl::OnPaste(wxCommandEvent&)
       OnPaste__10wxTextCtrlFR14wxCommandEvent
+      ;wxTextCtrl::OnDelete(wxCommandEvent&)
+      OnDelete__10wxTextCtrlFR14wxCommandEvent
       ;wxTextCtrl::OnChar(wxKeyEvent&)
       OnChar__10wxTextCtrlFR10wxKeyEvent
       ;wxTextCtrl::Remove(long,long)
@@ -14480,13 +14582,14 @@ EXPORTS
       OS2GetStyle__10wxTextCtrlCFlPUl
       ;wxTextCtrl::sm_classwxTextCtrl
       sm_classwxTextCtrl__10wxTextCtrl
-      __vft10wxTextCtrl8wxObject
       ;wxTextCtrl::ShowPosition(long)
       ShowPosition__10wxTextCtrlFl
       ;wxTextCtrl::SetWindowStyleFlag(long)
       SetWindowStyleFlag__10wxTextCtrlFl
       ;wxTextCtrl::SetEditable(unsigned long)
       SetEditable__10wxTextCtrlFUl
+      ;wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent&)
+      OnUpdateSelectAll__10wxTextCtrlFR15wxUpdateUIEvent
       ;wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent&)
       OnUpdateCopy__10wxTextCtrlFR15wxUpdateUIEvent
       ;wxTextCtrl::OnCut(wxCommandEvent&)
@@ -14519,6 +14622,8 @@ EXPORTS
       Create__10wxTextCtrlFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelRC11wxValidatorT3
       ;wxTextCtrl::SetInsertionPoint(long)
       SetInsertionPoint__10wxTextCtrlFl
+      ;wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent&)
+      OnUpdateDelete__10wxTextCtrlFR15wxUpdateUIEvent
       ;wxTextCtrl::GetLineLength(long) const
       GetLineLength__10wxTextCtrlCFl
       ;wxTextCtrl::Cut()
@@ -14549,6 +14654,8 @@ EXPORTS
       sm_eventTableEntries__10wxTextCtrl
       ;wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent&)
       OnUpdateRedo__10wxTextCtrlFR15wxUpdateUIEvent
+      ;wxTextCtrl::OnSelectAll(wxCommandEvent&)
+      OnSelectAll__10wxTextCtrlFR14wxCommandEvent
       ;wxTextCtrl::OnDropFiles(wxDropFilesEvent&)
       OnDropFiles__10wxTextCtrlFR16wxDropFilesEvent
       ;wxTextCtrl::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
@@ -14703,6 +14810,8 @@ EXPORTS
       wxTimerList
       ;wxTimer::Init()
       Init__7wxTimerFv
+      ;wxTimer::Notify()
+      Notify__7wxTimerFv
       ;wxTimer::Start(int,unsigned long)
       Start__7wxTimerFiUl
       ;wxTimer::~wxTimer()
@@ -14717,6 +14826,8 @@ EXPORTS
       CreateTool__9wxToolBarFP9wxControl
       ;wxToolBar::DoToggleTool(wxToolBarToolBase*,unsigned long)
       DoToggleTool__9wxToolBarFP17wxToolBarToolBaseUl
+      ;wxToolBar::DeleteToolByPos(unsigned int)
+      DeleteToolByPos__9wxToolBarFUi
       ;wxToolBar::SpringUpButton(int)
       SpringUpButton__9wxToolBarFi
       ;wxToolBar::Init()
@@ -14725,10 +14836,14 @@ EXPORTS
       sm_eventTable__9wxToolBar
       ;wxToolBar::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__9wxToolBarFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxToolBar::InsertControl(unsigned int,wxControl*)
+      InsertControl__9wxToolBarFUiP9wxControl
       ;wxToolBar::OnKillFocus(wxFocusEvent&)
       OnKillFocus__9wxToolBarFR12wxFocusEvent
       ;wxToolBar::LowerTool(wxToolBarToolBase*,unsigned long)
       LowerTool__9wxToolBarFP17wxToolBarToolBaseUl
+      ;wxToolBar::InsertSeparator(unsigned int)
+      InsertSeparator__9wxToolBarFUi
       ;wxToolBar::DoInsertTool(unsigned int,wxToolBarToolBase*)
       DoInsertTool__9wxToolBarFUiP17wxToolBarToolBase
       ;wxToolBar::Realize()
@@ -14737,15 +14852,21 @@ EXPORTS
       sm_eventTableEntries__9wxToolBar
       ;wxToolBar::sm_classwxToolBar
       sm_classwxToolBar__9wxToolBar
-      ;wxToolBar::OnPaint(wxPaintEvent&)
-      OnPaint__9wxToolBarFR12wxPaintEvent
+      ;wxToolBar::InsertTool(unsigned int,int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*)
+      InsertTool__9wxToolBarFUiiRC8wxStringRC8wxBitmapT410wxItemKindN23P8wxObject
       __vft9wxToolBar8wxObject
       ;wxToolBar::RaiseTool(wxToolBarToolBase*,unsigned long)
       RaiseTool__9wxToolBarFP17wxToolBarToolBaseUl
+      ;wxToolBar::OnPaint(wxPaintEvent&)
+      OnPaint__9wxToolBarFR12wxPaintEvent
+      ;wxToolBar::DeleteTool(int)
+      DeleteTool__9wxToolBarFi
       ;wxToolBar::DrawTool(wxDC&,wxToolBarToolBase*)
       DrawTool__9wxToolBarFR4wxDCP17wxToolBarToolBase
       ;wxToolBar::OnSize(wxSizeEvent&)
       OnSize__9wxToolBarFR11wxSizeEvent
+      ;wxToolBar::OnTimer(wxTimerEvent&)
+      OnTimer__9wxToolBarFR12wxTimerEvent
       ;wxToolBar::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__9wxToolBarFR12wxMouseEvent
       ;wxToolBar::DoSetToggle(wxToolBarToolBase*,unsigned long)
@@ -14766,8 +14887,6 @@ EXPORTS
       GetEventTable__9wxToolBarCFv
       ;wxToolBar::CreateTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,wxObject*,const wxString&,const wxString&)
       CreateTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindP8wxObjectN22
-      ;wxDisableBitmap(const wxBitmap&,long)
-      wxDisableBitmap__FRC8wxBitmapl
       ;wxConstructorForwxToolBar()
       wxConstructorForwxToolBar__Fv
       ;wxToolBar::m_bInitialized
@@ -14778,25 +14897,17 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxToolTip::wxToolTip(const wxString&)
       __ct__9wxToolTipFRC8wxString
-      ;wxToolTip::SetWindow(wxWindow*)
-      SetWindow__9wxToolTipFP8wxWindow
       __vft9wxToolTip8wxObject
-      ;wxToolTip::RelayEvent(void**)
-      RelayEvent__9wxToolTipFPPv
       ;wxToolTip::~wxToolTip()
       __dt__9wxToolTipFv
-      ;wxToolTip::Enable(unsigned long)
-      Enable__9wxToolTipFUl
-      ;wxToolTip::SetDelay(long)
-      SetDelay__9wxToolTipFl
+      ;wxToolTip::HideToolTipWindow()
+      HideToolTipWindow__9wxToolTipFv
       ;wxToolTip::SetTip(const wxString&)
       SetTip__9wxToolTipFRC8wxString
-      ;wxToolTip::GetToolTipCtrl()
-      GetToolTipCtrl__9wxToolTipFv
-      ;wxToolTip::Remove()
-      Remove__9wxToolTipFv
-      ;wxToolTip::hwndTT
-      hwndTT__9wxToolTip
+      ;wxToolTip::DisplayToolTipWindow(const wxPoint&)
+      DisplayToolTipWindow__9wxToolTipFRC7wxPoint
+      ;wxToolTip::Create(const wxString&)
+      Create__9wxToolTipFRC8wxString
   ;From object file:  ..\os2\toplevel.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxTopLevelWindowOS2::OS2GetStyle(long,unsigned long*) const
@@ -14804,14 +14915,23 @@ EXPORTS
       __vft19wxTopLevelWindowOS28wxObject
       ;wxTopLevelWindowOS2::CreateFrame(const wxString&,const wxPoint&,const wxSize&)
       CreateFrame__19wxTopLevelWindowOS2FRC8wxStringRC7wxPointRC6wxSize
+      ;wxTLWHiddenParentModule::m_shWnd
+      m_shWnd__23wxTLWHiddenParentModule
       ;wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
       __dt__19wxTopLevelWindowOS2Fv
       ;wxTopLevelWindowOS2::sm_eventTableEntries
       sm_eventTableEntries__19wxTopLevelWindowOS2
+      ;wxTLWHiddenParentModule::OnInit()
+      OnInit__23wxTLWHiddenParentModuleFv
+      ;wxTLWHiddenParentModule::GetHWND()
+      GetHWND__23wxTLWHiddenParentModuleFv
       ;wxTopLevelWindowOS2::ShowFullScreen(unsigned long,long)
       ShowFullScreen__19wxTopLevelWindowOS2FUll
+      __vft23wxTLWHiddenParentModule8wxObject
       ;wxTopLevelWindowOS2::CreateDialog(unsigned long,const wxString&,const wxPoint&,const wxSize&)
       CreateDialog__19wxTopLevelWindowOS2FUlRC8wxStringRC7wxPointRC6wxSize
+      ;wxTLWHiddenParentModule::sm_classwxTLWHiddenParentModule
+      sm_classwxTLWHiddenParentModule__23wxTLWHiddenParentModule
       ;wxTopLevelWindowOS2::DoShowWindow(int)
       DoShowWindow__19wxTopLevelWindowOS2Fi
       ;wxTopLevelWindowOS2::Init()
@@ -14826,6 +14946,8 @@ EXPORTS
       Iconize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
       DoSetClientSize__19wxTopLevelWindowOS2FiT1
+      ;wxTLWHiddenParentModule::m_szClassName
+      m_szClassName__23wxTLWHiddenParentModule
       ;wxTopLevelWindowOS2::IsMaximized() const
       IsMaximized__19wxTopLevelWindowOS2CFv
       ;wxTopLevelWindowOS2::m_spHiddenParent
@@ -14834,6 +14956,8 @@ EXPORTS
       SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
       ;wxTopLevelWindowOS2::Restore()
       Restore__19wxTopLevelWindowOS2Fv
+      ;wxTLWHiddenParentModule::OnExit()
+      OnExit__23wxTLWHiddenParentModuleFv
       ;wxTopLevelWindowOS2::OnActivate(wxActivateEvent&)
       OnActivate__19wxTopLevelWindowOS2FR15wxActivateEvent
       ;wxTopLevelWindowOS2::Maximize(unsigned long)
@@ -14842,6 +14966,8 @@ EXPORTS
       EnableCloseButton__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::DoGetClientSize(int*,int*) const
       DoGetClientSize__19wxTopLevelWindowOS2CFPiT1
+      ;wxConstructorForwxTLWHiddenParentModule()
+      wxConstructorForwxTLWHiddenParentModule__Fv
       ;wxTopLevelWindowOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
       Create__19wxTopLevelWindowOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
       ;wxTopLevelWindowOS2::Show(unsigned long)
@@ -14926,6 +15052,8 @@ EXPORTS
       wxShell__FRC8wxString
       ;wxGetUserHome(const wxString&)
       wxGetUserHome__FRC8wxString
+      ;wxDisableBitmap(const wxBitmap&,long)
+      wxDisableBitmap__FRC8wxBitmapl
       ;wxWriteResource(const wxString&,const wxString&,const wxString&,const wxString&)
       wxWriteResource__FRC8wxStringN31
       ;wxWriteResource(const wxString&,const wxString&,long,const wxString&)