Fixed a strange MSVC compile error (C2253) It thought a pure virtual

[wxWidgets.git] / src / os2 / wx23.def
diff --git a/src/os2/wx23.def b/src/os2/wx23.def

index 29f32e4a8de7b03babf7267a86a78e7ab450d6bb..17e3bbfb43f35ac477cdcaadc8dcc01472dd055b 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -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\Wx2\WxWindows\Lib\WX.lib
    ;From object file:  dummy.cpp
      ;PUBDEFs (Symbols available from object file):
        wxDummyChar
@@ -61,6 +61,10 @@ EXPORTS
        OnInitCmdLine__9wxAppBaseFR15wxCmdLineParser
        ;wxAppBase::OnCmdLineParsed(wxCmdLineParser&)
        OnCmdLineParsed__9wxAppBaseFR15wxCmdLineParser
+      ;wxAppBase::CheckBuildOptions(const wxBuildOptions&)
+      CheckBuildOptions__9wxAppBaseFRC14wxBuildOptions
+      ;wxAppBase::FilterEvent(wxEvent&)
+      FilterEvent__9wxAppBaseFR7wxEvent
        __vft9wxAppBase8wxObject
        ;wxAppBase::OnCmdLineHelp(wxCmdLineParser&)
        OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
@@ -131,12 +135,10 @@ EXPORTS
        Index__13wxArrayParamsCFRC14wxCmdLineParamUl
        ;wxCmdLineParser::Found(const wxString&,long*) const
        Found__15wxCmdLineParserCFRC8wxStringPl
-      ;wxArrayParams::RemoveAt(unsigned int)
-      RemoveAt__13wxArrayParamsFUi
+      ;wxArrayParams::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__13wxArrayParamsFUiT1
        ;wxCmdLineParser::AddSwitch(const wxString&,const wxString&,const wxString&,int)
        AddSwitch__15wxCmdLineParserFRC8wxStringN21i
-      ;wxArrayOptions::Add(const wxCmdLineOption&)
-      Add__14wxArrayOptionsFRC15wxCmdLineOption
        ;wxCmdLineParser::Reset()
        Reset__15wxCmdLineParserFv
        ;wxCmdLineParser::SetCmdLine(int,char**)
@@ -153,10 +155,8 @@ EXPORTS
        FindOptionByLongName__19wxCmdLineParserDataFRC8wxString
        ;wxArrayOptions::Index(const wxCmdLineOption&,unsigned long) const
        Index__14wxArrayOptionsCFRC15wxCmdLineOptionUl
-      ;wxArrayOptions::RemoveAt(unsigned int)
-      RemoveAt__14wxArrayOptionsFUi
-      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int)
-      Insert__13wxArrayParamsFRC14wxCmdLineParamUi
+      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int,unsigned int)
+      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUiT2
        ;wxCmdLineParserData::wxCmdLineParserData()
        __ct__19wxCmdLineParserDataFv
        ;wxCmdLineParser::SetCmdLine(const wxString&)
@@ -169,28 +169,30 @@ EXPORTS
        SetArguments__19wxCmdLineParserDataFRC8wxString
        ;wxCmdLineParser::ConvertStringToArgs(const char*)
        ConvertStringToArgs__15wxCmdLineParserFPCc
-      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int)
-      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUi
-      ;wxArrayParams::Add(const wxCmdLineParam&)
-      Add__13wxArrayParamsFRC14wxCmdLineParam
+      ;wxArrayOptions::Add(const wxCmdLineOption&,unsigned int)
+      Add__14wxArrayOptionsFRC15wxCmdLineOptionUi
        ;wxArrayParams::DoEmpty()
        DoEmpty__13wxArrayParamsFv
        ;wxArrayOptions::~wxArrayOptions()
        __dt__14wxArrayOptionsFv
        ;wxCmdLineParser::Usage()
        Usage__15wxCmdLineParserFv
+      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int,unsigned int)
+      Insert__13wxArrayParamsFRC14wxCmdLineParamUiT2
        ;wxCmdLineParserData::SetArguments(int,char**)
        SetArguments__19wxCmdLineParserDataFiPPc
        ;wxCmdLineParser::Found(const wxString&) const
        Found__15wxCmdLineParserCFRC8wxString
        ;wxCmdLineParser::Parse(unsigned long)
        Parse__15wxCmdLineParserFUl
-      ;wxCmdLineParser::AddParam(const wxString&,wxCmdLineParamType,int)
-      AddParam__15wxCmdLineParserFRC8wxString18wxCmdLineParamTypei
+      ;wxArrayParams::Add(const wxCmdLineParam&,unsigned int)
+      Add__13wxArrayParamsFRC14wxCmdLineParamUi
        ;wxCmdLineParser::GetParam(unsigned int) const
        GetParam__15wxCmdLineParserCFUi
        ;wxCmdLineParser::Found(const wxString&,wxDateTime*) const
        Found__15wxCmdLineParserCFRC8wxStringP10wxDateTime
+      ;wxCmdLineParser::AddParam(const wxString&,wxCmdLineParamType,int)
+      AddParam__15wxCmdLineParserFRC8wxString18wxCmdLineParamTypei
        ;wxCmdLineParser::Init()
        Init__15wxCmdLineParserFv
        ;wxCmdLineParser::~wxCmdLineParser()
@@ -199,6 +201,8 @@ EXPORTS
        __dt__13wxArrayParamsFv
        ;wxArrayParams::operator=(const wxArrayParams&)
        __as__13wxArrayParamsFRC13wxArrayParams
+      ;wxArrayOptions::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__14wxArrayOptionsFUiT1
        ;wxCmdLineParser::AddOption(const wxString&,const wxString&,const wxString&,wxCmdLineParamType,int)
        AddOption__15wxCmdLineParserFRC8wxStringN2118wxCmdLineParamTypei
        ;wxArrayOptions::DoEmpty()
@@ -225,14 +229,16 @@ EXPORTS
        __ct__21wxPageSetupDialogDataFRC11wxPrintData
        ;wxPageSetupDialogData::operator=(const wxPageSetupDialogData&)
        __as__21wxPageSetupDialogDataFRC21wxPageSetupDialogData
-      ;wxPrintData::wxPrintData()
-      __ct__11wxPrintDataFv
+      ;wxFontDialogBase::~wxFontDialogBase()
+      __dt__16wxFontDialogBaseFv
        ;wxConstructorForwxPageSetupDialogData()
        wxConstructorForwxPageSetupDialogData__Fv
        ;wxPrintDialogData::~wxPrintDialogData()
        __dt__17wxPrintDialogDataFv
        ;wxColourData::wxColourData()
        __ct__12wxColourDataFv
+      ;wxPrintData::wxPrintData()
+      __ct__11wxPrintDataFv
        ;wxPageSetupDialogData::CalculatePaperSizeFromId()
        CalculatePaperSizeFromId__21wxPageSetupDialogDataFv
        ;wxPageSetupDialogData::CalculateIdFromPaperSize()
@@ -245,12 +251,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
@@ -265,17 +271,20 @@ EXPORTS
        __as__17wxPrintDialogDataFRC17wxPrintDialogData
        ;wxPrintDialogData::operator=(const wxPrintData&)
        __as__17wxPrintDialogDataFRC11wxPrintData
-      ;wxConstructorForwxFontData()
-      wxConstructorForwxFontData__Fv
        ;wxFontData::wxFontData()
        __ct__10wxFontDataFv
-      __vft12wxColourData8wxObject
-      __vft17wxPrintDialogData8wxObject
+      ;wxConstructorForwxFontData()
+      wxConstructorForwxFontData__Fv
        __vft10wxFontData8wxObject
+      __vft17wxPrintDialogData8wxObject
+      __vft16wxFontDialogBase8wxObject
+      __vft12wxColourData8wxObject
        ;wxColourData::operator=(const wxColourData&)
        __as__12wxColourDataFRC12wxColourData
        ;wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData&)
        __ct__17wxPrintDialogDataFRC17wxPrintDialogData
+      ;wxPrintData::Ok() const
+      Ok__11wxPrintDataCFv
        ;wxConstructorForwxPrintData()
        wxConstructorForwxPrintData__Fv
        ;wxPageSetupDialogData::~wxPageSetupDialogData()
@@ -510,15 +519,19 @@ EXPORTS
        GetClientObject__15wxItemContainerCFi
        ;wxItemContainer::SetClientData(int,void*)
        SetClientData__15wxItemContainerFiPv
+      __vft18wxControlWithItems8wxObject
        ;wxItemContainer::Append(const wxArrayString&)
        Append__15wxItemContainerFRC13wxArrayString
        ;wxItemContainer::~wxItemContainer()
        __dt__15wxItemContainerFv
+      ;wxControlWithItems::~wxControlWithItems()
+      __dt__18wxControlWithItemsFv
        ;wxItemContainer::GetStringSelection() const
        GetStringSelection__15wxItemContainerCFv
        ;wxItemContainer::SetClientObject(int,wxClientData*)
        SetClientObject__15wxItemContainerFiP12wxClientData
        __vft15wxItemContainer
+      __vft18wxControlWithItems15wxItemContainer
    ;From object file:  ..\common\datetime.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxDateTime::wxDateTime(double)
@@ -543,8 +556,6 @@ EXPORTS
        Multiply__10wxDateSpanFi
        ;wxDateTime::IsWorkDay(wxDateTime::Country) const
        IsWorkDay__10wxDateTimeCFQ2_10wxDateTime7Country
-      ;wxDateTimeArray::Insert(const wxDateTime&,unsigned int)
-      Insert__15wxDateTimeArrayFRC10wxDateTimeUi
        ;wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags,const wxDateTime::TimeZone&) const
        GetWeekOfYear__10wxDateTimeCFQ2_10wxDateTime9WeekFlagsRCQ2_10wxDateTime8TimeZone
        ;wxDateTime::GetLastMonthDay(wxDateTime::Month,int) const
@@ -647,6 +658,8 @@ EXPORTS
        Set__10wxDateTimeFUsN31
        ;wxDateTime::SetToLastWeekDay(wxDateTime::WeekDay,wxDateTime::Month,int)
        SetToLastWeekDay__10wxDateTimeFQ2_10wxDateTime7WeekDayQ2_10wxDateTime5Monthi
+      ;wxDateTimeArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__15wxDateTimeArrayFUiT1
        ;wxDateTime::ParseFormat(const char*,const char*,const wxDateTime&)
        ParseFormat__10wxDateTimeFPCcT1RC10wxDateTime
        ;wxDateSpan::Multiply(int) const
@@ -671,8 +684,8 @@ EXPORTS
        DoGetHolidaysInRange__18wxDateTimeWorkDaysCFRC10wxDateTimeT1R15wxDateTimeArray
        ;wxDateTime::ConvertYearToBC(int)
        ConvertYearToBC__10wxDateTimeFi
-      ;wxDateTimeArray::Add(const wxDateTime&)
-      Add__15wxDateTimeArrayFRC10wxDateTime
+      ;wxDateTimeArray::Add(const wxDateTime&,unsigned int)
+      Add__15wxDateTimeArrayFRC10wxDateTimeUi
        ;wxDateTime::Tm::AddMonths(int)
        AddMonths__Q2_10wxDateTime2TmFi
        ;wxDateTime::TimeZone::TimeZone(wxDateTime::TZ)
@@ -683,6 +696,8 @@ EXPORTS
        IsLeapYear__10wxDateTimeFiQ2_10wxDateTime8Calendar
        ;wxTimeSpan::IsEqualTo(const wxTimeSpan&) const
        IsEqualTo__10wxTimeSpanCFRC10wxTimeSpan
+      ;wxDateTimeArray::Insert(const wxDateTime&,unsigned int,unsigned int)
+      Insert__15wxDateTimeArrayFRC10wxDateTimeUiT2
        ;wxTimeSpan::GetWeeks() const
        GetWeeks__10wxTimeSpanCFv
        ;wxDateTime::GetTicks() const
@@ -710,8 +725,6 @@ EXPORTS
        SetToTheWeek__10wxDateTimeFUsQ2_10wxDateTime7WeekDay
        ;wxDateTime::SetToPrevWeekDay(wxDateTime::WeekDay)
        SetToPrevWeekDay__10wxDateTimeFQ2_10wxDateTime7WeekDay
-      ;wxDateTimeArray::RemoveAt(unsigned int)
-      RemoveAt__15wxDateTimeArrayFUi
        ;wxDateTime::IsSameTime(const wxDateTime&) const
        IsSameTime__10wxDateTimeCFRC10wxDateTime
        ;wxDateTime::IsSameDate(const wxDateTime&) const
@@ -967,6 +980,8 @@ EXPORTS
        RemoveChild__12wxDialogBaseFP12wxWindowBase
        ;wxDialogBase::GetEventTable() const
        GetEventTable__12wxDialogBaseCFv
+      ;wxDialogBase::SetTmpDefaultItem(wxWindow*)
+      SetTmpDefaultItem__12wxDialogBaseFP8wxWindow
    ;From object file:  ..\common\dobjcmn.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxDataObjectComposite::GetDataSize(const wxDataFormat&) const
@@ -1392,18 +1407,12 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxBaseArrayPtrVoid::Index(const void*,unsigned long) const
        Index__18wxBaseArrayPtrVoidCFPCvUl
-      ;wxBaseArrayInt::Add(int)
-      Add__14wxBaseArrayIntFi
-      ;wxBaseArrayLong::Insert(long,unsigned int)
-      Insert__15wxBaseArrayLongFlUi
-      ;wxBaseArrayInt::Insert(int,unsigned int)
-      Insert__14wxBaseArrayIntFiUi
+      ;wxBaseArrayPtrVoid::Alloc(unsigned int)
+      Alloc__18wxBaseArrayPtrVoidFUi
        ;wxBaseArrayLong::Index(long,int(*)(const void*,const void*)) const
        Index__15wxBaseArrayLongCFlPFPCvT1_i
        ;wxBaseArrayInt::Index(int,int(*)(const void*,const void*)) const
        Index__14wxBaseArrayIntCFiPFPCvT1_i
-      ;wxBaseArrayPtrVoid::Alloc(unsigned int)
-      Alloc__18wxBaseArrayPtrVoidFUi
        ;wxBaseArrayPtrVoid::Add(const void*,int(*)(const void*,const void*))
        Add__18wxBaseArrayPtrVoidFPCvPFPCvT1_i
        ;wxBaseArrayShort::~wxBaseArrayShort()
@@ -1416,24 +1425,28 @@ EXPORTS
        Shrink__16wxBaseArrayShortFv
        ;wxBaseArrayInt::Shrink()
        Shrink__14wxBaseArrayIntFv
-      ;wxBaseArrayPtrVoid::Grow()
-      Grow__18wxBaseArrayPtrVoidFv
+      ;wxBaseArrayLong::Insert(long,unsigned int,unsigned int)
+      Insert__15wxBaseArrayLongFlUiT2
+      ;wxBaseArrayInt::Insert(int,unsigned int,unsigned int)
+      Insert__14wxBaseArrayIntFiUiT2
        ;wxBaseArrayPtrVoid::Clear()
        Clear__18wxBaseArrayPtrVoidFv
        ;wxBaseArrayShort::Remove(short)
        Remove__16wxBaseArrayShortFs
        ;wxBaseArrayPtrVoid::operator=(const wxBaseArrayPtrVoid&)
        __as__18wxBaseArrayPtrVoidFRC18wxBaseArrayPtrVoid
-      ;wxBaseArrayShort::Insert(short,unsigned int)
-      Insert__16wxBaseArrayShortFsUi
-      ;wxBaseArrayPtrVoid::RemoveAt(unsigned int)
-      RemoveAt__18wxBaseArrayPtrVoidFUi
+      ;wxBaseArrayShort::Add(short,unsigned int)
+      Add__16wxBaseArrayShortFsUi
        ;wxBaseArrayShort::Index(short,int(*)(const void*,const void*)) const
        Index__16wxBaseArrayShortCFsPFPCvT1_i
        ;wxBaseArrayShort::IndexForInsert(short,int(*)(const void*,const void*)) const
        IndexForInsert__16wxBaseArrayShortCFsPFPCvT1_i
        ;wxBaseArrayLong::IndexForInsert(long,int(*)(const void*,const void*)) const
        IndexForInsert__15wxBaseArrayLongCFlPFPCvT1_i
+      ;wxBaseArrayShort::Grow(unsigned int)
+      Grow__16wxBaseArrayShortFUi
+      ;wxBaseArrayInt::Grow(unsigned int)
+      Grow__14wxBaseArrayIntFUi
        ;wxBaseArrayLong::Alloc(unsigned int)
        Alloc__15wxBaseArrayLongFUi
        ;wxBaseArrayInt::Add(int,int(*)(const void*,const void*))
@@ -1444,28 +1457,30 @@ EXPORTS
        __ct__18wxBaseArrayPtrVoidFv
        ;wxBaseArrayInt::Clear()
        Clear__14wxBaseArrayIntFv
-      ;wxBaseArrayShort::Add(short)
-      Add__16wxBaseArrayShortFs
        ;wxBaseArrayInt::operator=(const wxBaseArrayInt&)
        __as__14wxBaseArrayIntFRC14wxBaseArrayInt
        ;wxBaseArrayInt::wxBaseArrayInt(const wxBaseArrayInt&)
        __ct__14wxBaseArrayIntFRC14wxBaseArrayInt
        ;wxBaseArrayLong::Remove(long)
        Remove__15wxBaseArrayLongFl
-      ;wxBaseArrayShort::Sort(int(*)(const void*,const void*))
-      Sort__16wxBaseArrayShortFPFPCvT1_i
+      ;wxBaseArrayShort::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__16wxBaseArrayShortFUiT1
        ;wxBaseArrayPtrVoid::Sort(int(*)(const void*,const void*))
        Sort__18wxBaseArrayPtrVoidFPFPCvT1_i
+      ;wxBaseArrayShort::Sort(int(*)(const void*,const void*))
+      Sort__16wxBaseArrayShortFPFPCvT1_i
+      ;wxBaseArrayLong::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__15wxBaseArrayLongFUiT1
        ;wxBaseArrayInt::IndexForInsert(int,int(*)(const void*,const void*)) const
        IndexForInsert__14wxBaseArrayIntCFiPFPCvT1_i
        ;wxBaseArrayShort::Alloc(unsigned int)
        Alloc__16wxBaseArrayShortFUi
+      ;wxBaseArrayPtrVoid::Insert(const void*,unsigned int,unsigned int)
+      Insert__18wxBaseArrayPtrVoidFPCvUiT2
        ;wxBaseArrayPtrVoid::Shrink()
        Shrink__18wxBaseArrayPtrVoidFv
        ;wxBaseArrayPtrVoid::Remove(const void*)
        Remove__18wxBaseArrayPtrVoidFPCv
-      ;wxBaseArrayShort::Grow()
-      Grow__16wxBaseArrayShortFv
        ;wxBaseArrayShort::operator=(const wxBaseArrayShort&)
        __as__16wxBaseArrayShortFRC16wxBaseArrayShort
        ;wxBaseArrayPtrVoid::wxBaseArrayPtrVoid(const wxBaseArrayPtrVoid&)
@@ -1474,50 +1489,50 @@ EXPORTS
        Index__16wxBaseArrayShortCFsUl
        ;wxBaseArrayInt::Index(int,unsigned long) const
        Index__14wxBaseArrayIntCFiUl
-      ;wxBaseArrayLong::Add(long)
-      Add__15wxBaseArrayLongFl
        ;wxBaseArrayInt::Sort(int(*)(const void*,const void*))
        Sort__14wxBaseArrayIntFPFPCvT1_i
        ;wxBaseArrayLong::Sort(int(*)(const void*,const void*))
        Sort__15wxBaseArrayLongFPFPCvT1_i
-      ;wxBaseArrayLong::RemoveAt(unsigned int)
-      RemoveAt__15wxBaseArrayLongFUi
-      ;wxBaseArrayPtrVoid::Insert(const void*,unsigned int)
-      Insert__18wxBaseArrayPtrVoidFPCvUi
+      ;wxBaseArrayPtrVoid::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__18wxBaseArrayPtrVoidFUiT1
        ;wxBaseArrayPtrVoid::Index(const void*,int(*)(const void*,const void*)) const
        Index__18wxBaseArrayPtrVoidCFPCvPFPCvT1_i
        ;wxBaseArrayPtrVoid::IndexForInsert(const void*,int(*)(const void*,const void*)) const
        IndexForInsert__18wxBaseArrayPtrVoidCFPCvPFPCvT1_i
+      ;wxBaseArrayPtrVoid::Grow(unsigned int)
+      Grow__18wxBaseArrayPtrVoidFUi
+      ;wxBaseArrayLong::Grow(unsigned int)
+      Grow__15wxBaseArrayLongFUi
        ;wxBaseArrayInt::Alloc(unsigned int)
        Alloc__14wxBaseArrayIntFUi
+      ;wxBaseArrayLong::Add(long,unsigned int)
+      Add__15wxBaseArrayLongFlUi
        ;wxBaseArrayLong::Add(long,int(*)(const void*,const void*))
        Add__15wxBaseArrayLongFlPFPCvT1_i
        ;wxBaseArrayLong::wxBaseArrayLong()
        __ct__15wxBaseArrayLongFv
-      ;wxBaseArrayLong::Grow()
-      Grow__15wxBaseArrayLongFv
-      ;wxBaseArrayInt::Grow()
-      Grow__14wxBaseArrayIntFv
        ;wxBaseArrayShort::Clear()
        Clear__16wxBaseArrayShortFv
-      ;wxBaseArrayPtrVoid::Add(const void*)
-      Add__18wxBaseArrayPtrVoidFPCv
        ;wxBaseArrayLong::Index(long,unsigned long) const
        Index__15wxBaseArrayLongCFlUl
        ;wxBaseArrayShort::wxBaseArrayShort(const wxBaseArrayShort&)
        __ct__16wxBaseArrayShortFRC16wxBaseArrayShort
-      ;wxBaseArrayShort::RemoveAt(unsigned int)
-      RemoveAt__16wxBaseArrayShortFUi
+      ;wxBaseArrayInt::Add(int,unsigned int)
+      Add__14wxBaseArrayIntFiUi
        ;wxBaseArrayInt::Remove(int)
        Remove__14wxBaseArrayIntFi
-      ;wxBaseArrayInt::RemoveAt(unsigned int)
-      RemoveAt__14wxBaseArrayIntFUi
+      ;wxBaseArrayInt::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__14wxBaseArrayIntFUiT1
+      ;wxBaseArrayPtrVoid::Add(const void*,unsigned int)
+      Add__18wxBaseArrayPtrVoidFPCvUi
        ;wxBaseArrayShort::Add(short,int(*)(const void*,const void*))
        Add__16wxBaseArrayShortFsPFPCvT1_i
-      ;wxBaseArrayInt::wxBaseArrayInt()
-      __ct__14wxBaseArrayIntFv
+      ;wxBaseArrayShort::Insert(short,unsigned int,unsigned int)
+      Insert__16wxBaseArrayShortFsUiT2
        ;wxBaseArrayLong::~wxBaseArrayLong()
        __dt__15wxBaseArrayLongFv
+      ;wxBaseArrayInt::wxBaseArrayInt()
+      __ct__14wxBaseArrayIntFv
        ;wxBaseArrayLong::Shrink()
        Shrink__15wxBaseArrayLongFv
        ;wxBaseArrayLong::Clear()
@@ -1709,6 +1724,8 @@ EXPORTS
        wxConstructorForwxSysColourChangedEvent__Fv
        ;wxConstructorForwxNavigationKeyEvent()
        wxConstructorForwxNavigationKeyEvent__Fv
+      ;wxConstructorForwxMouseCaptureChangedEvent()
+      wxConstructorForwxMouseCaptureChangedEvent__Fv
        ;wxConstructorForwxHelpEvent()
        wxConstructorForwxHelpEvent__Fv
        ;wxEvtHandler::~wxEvtHandler()
@@ -1781,8 +1798,8 @@ EXPORTS
        wxEVT_KILL_FOCUS
        wxEVT_COMMAND_RIGHT_DCLICK
        wxEVT_CLOSE_WINDOW
-      ;wxEvtHandler::ProcessEvent(wxEvent&)
-      ProcessEvent__12wxEvtHandlerFR7wxEvent
+      ;wxMouseEvent::Assign(const wxMouseEvent&)
+      Assign__12wxMouseEventFRC12wxMouseEvent
        wxEVT_SCROLL_LINEUP
        wxEVT_PAINT
        wxEVT_NULL
@@ -1810,6 +1827,8 @@ EXPORTS
        sm_classwxEraseEvent__12wxEraseEvent
        ;wxEvtHandler::SearchEventTable(wxEventTable&,wxEvent&)
        SearchEventTable__12wxEvtHandlerFR12wxEventTableR7wxEvent
+      ;wxEvtHandler::ProcessEvent(wxEvent&)
+      ProcessEvent__12wxEvtHandlerFR7wxEvent
        ;wxMouseEvent::wxMouseEvent(int)
        __ct__12wxMouseEventFi
        wxEVT_JOY_ZMOVE
@@ -1879,6 +1898,8 @@ EXPORTS
        sm_classwxScrollWinEvent__16wxScrollWinEvent
        ;wxNcPaintEvent::sm_classwxNcPaintEvent
        sm_classwxNcPaintEvent__14wxNcPaintEvent
+      ;wxMouseCaptureChangedEvent::sm_classwxMouseCaptureChangedEvent
+      sm_classwxMouseCaptureChangedEvent__26wxMouseCaptureChangedEvent
        ;wxIdleEvent::sm_classwxIdleEvent
        sm_classwxIdleEvent__11wxIdleEvent
        ;wxDropFilesEvent::sm_classwxDropFilesEvent
@@ -2448,6 +2469,8 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxFrameBase::OnIdle(wxIdleEvent&)
        OnIdle__11wxFrameBaseFR11wxIdleEvent
+      ;wxFrameBase::PushStatusText(const wxString&,int)
+      PushStatusText__11wxFrameBaseFRC8wxStringi
        ;wxFrameBase::DeleteAllBars()
        DeleteAllBars__11wxFrameBaseFv
        ;wxFrameBase::SetMenuBar(wxMenuBar*)
@@ -2474,6 +2497,8 @@ EXPORTS
        ProcessCommand__11wxFrameBaseFi
        ;wxFrameBase::SetStatusWidths(int,const int*)
        SetStatusWidths__11wxFrameBaseFiPCi
+      ;wxFrameBase::PopStatusText(int)
+      PopStatusText__11wxFrameBaseFi
        ;wxFrameBase::wxFrameBase()
        __ct__11wxFrameBaseFv
        ;wxFrameBase::CreateToolBar(long,int,const wxString&)
@@ -2488,6 +2513,8 @@ EXPORTS
        __dt__11wxFrameBaseFv
        ;wxFrameBase::AttachMenuBar(wxMenuBar*)
        AttachMenuBar__11wxFrameBaseFP9wxMenuBar
+      ;wxFrameBase::DoGiveHelp(const wxString&,unsigned long)
+      DoGiveHelp__11wxFrameBaseFRC8wxStringUl
        __vft11wxFrameBase8wxObject
        ;wxFrameBase::SetStatusText(const wxString&,int)
        SetStatusText__11wxFrameBaseFRC8wxStringi
@@ -2991,20 +3018,20 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxIconArray::DoCopy(const wxIconArray&)
        DoCopy__11wxIconArrayFRC11wxIconArray
-      ;wxIconArray::Insert(const wxIcon&,unsigned int)
-      Insert__11wxIconArrayFRC6wxIconUi
        ;wxIconArray::~wxIconArray()
        __dt__11wxIconArrayFv
+      ;wxIconArray::Add(const wxIcon&,unsigned int)
+      Add__11wxIconArrayFRC6wxIconUi
+      ;wxIconArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__11wxIconArrayFUiT1
        ;wxIconBundle::DeleteIcons()
        DeleteIcons__12wxIconBundleFv
-      ;wxIconArray::Add(const wxIcon&)
-      Add__11wxIconArrayFRC6wxIcon
        ;wxIconArray::Index(const wxIcon&,unsigned long) const
        Index__11wxIconArrayCFRC6wxIconUl
        ;wxIconBundle::operator=(const wxIconBundle&)
        __as__12wxIconBundleFRC12wxIconBundle
-      ;wxIconArray::RemoveAt(unsigned int)
-      RemoveAt__11wxIconArrayFUi
+      ;wxIconArray::Insert(const wxIcon&,unsigned int,unsigned int)
+      Insert__11wxIconArrayFRC6wxIconUiT2
        ;wxIconArray::DoEmpty()
        DoEmpty__11wxIconArrayFv
        ;wxIconBundle::AddIcon(const wxIcon&)
@@ -3124,8 +3151,8 @@ EXPORTS
        GetImageCount__7wxImageFR13wxInputStreaml
        ;wxImage::FindFirstUnusedColour(unsigned char*,unsigned char*,unsigned char*,unsigned char,unsigned char,unsigned char) const
        FindFirstUnusedColour__7wxImageCFPUcN21UcN24
-      ;wxImage::Scale(int,int) const
-      Scale__7wxImageCFiT1
+      ;wxImageHandler::CallDoCanRead(wxInputStream&)
+      CallDoCanRead__14wxImageHandlerFR13wxInputStream
        ;wxImage::sm_handlers
        sm_handlers__7wxImage
        ;wxImage::wxImage(const wxImage&)
@@ -3134,6 +3161,8 @@ EXPORTS
        __ct__7wxImageFR13wxInputStreamRC8wxStringi
        ;wxImage::SetPalette(const wxPalette&)
        SetPalette__7wxImageFRC9wxPalette
+      ;wxImage::Scale(int,int) const
+      Scale__7wxImageCFiT1
        ;wxImage::LoadFile(const wxString&,long,int)
        LoadFile__7wxImageFRC8wxStringli
        ;wxImageHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
@@ -3424,8 +3453,8 @@ EXPORTS
        Init__8wxLocaleFiT1
        ;wxLocaleModule::sm_classwxLocaleModule
        sm_classwxLocaleModule__14wxLocaleModule
-      ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int)
-      Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUi
+      ;wxLanguageInfoArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__19wxLanguageInfoArrayFUiT1
        ;wxLocale::GetSystemEncoding()
        GetSystemEncoding__8wxLocaleFv
        ;wxLocale::~wxLocale()
@@ -3450,16 +3479,18 @@ EXPORTS
        AddCatalog__8wxLocaleFPCc
        ;wxMsgCatalog::Load(const char*,const char*,unsigned long)
        Load__12wxMsgCatalogFPCcT1Ul
+      ;wxLanguageInfoArray::Add(const wxLanguageInfo&,unsigned int)
+      Add__19wxLanguageInfoArrayFRC14wxLanguageInfoUi
        ;wxMsgCatalogFile::wxMsgCatalogFile()
        __ct__16wxMsgCatalogFileFv
        ;wxLocale::wxLocale()
        __ct__8wxLocaleFv
+      ;wxLanguageInfoArray::Insert(const wxLanguageInfo&,unsigned int,unsigned int)
+      Insert__19wxLanguageInfoArrayFRC14wxLanguageInfoUiT2
        ;wxLocale::InitLanguagesDB()
        InitLanguagesDB__8wxLocaleFv
        ;wxLocale::GetSystemEncodingName()
        GetSystemEncodingName__8wxLocaleFv
-      ;wxLanguageInfoArray::Add(const wxLanguageInfo&)
-      Add__19wxLanguageInfoArrayFRC14wxLanguageInfo
        ;wxLocale::AddLanguage(const wxLanguageInfo&)
        AddLanguage__8wxLocaleFRC14wxLanguageInfo
        ;wxLocale::Init(const char*,const char*,const char*,unsigned long,unsigned long)
@@ -3488,8 +3519,6 @@ EXPORTS
        DoCopy__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
        ;wxLanguageInfoArray::operator=(const wxLanguageInfoArray&)
        __as__19wxLanguageInfoArrayFRC19wxLanguageInfoArray
-      ;wxLanguageInfoArray::RemoveAt(unsigned int)
-      RemoveAt__19wxLanguageInfoArrayFUi
        ;wxLocale::AddCatalogLookupPathPrefix(const wxString&)
        AddCatalogLookupPathPrefix__8wxLocaleFRC8wxString
        ;wxLocale::IsLoaded(const char*) const
@@ -3678,12 +3707,16 @@ EXPORTS
        SetActiveTarget__5wxLogFP5wxLog
        ;wxLogWarning(const char*,...)
        wxLogWarning__FPCce
+      ;wxSafeShowMessage(const wxString&,const wxString&)
+      wxSafeShowMessage__FRC8wxStringT1
        ;wxLogVerbose(const char*,...)
        wxLogVerbose__FPCce
        ;wxLogTrace(unsigned long,const char*,...)
        wxLogTrace__FUlPCce
        ;wxLogStatus(const char*,...)
        wxLogStatus__FPCce
+      ;wxLogChain::~wxLogChain()
+      __dt__10wxLogChainFv
        ;wxLog::ClearTraceMasks()
        ClearTraceMasks__5wxLogFv
        ;wxVLogError(const char*,char*)
@@ -4179,8 +4212,6 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxFileType::GetIcon(wxIcon*,wxString*,int*) const
        GetIcon__10wxFileTypeCFP6wxIconP8wxStringPi
-      ;wxArrayFileTypeInfo::Add(const wxFileTypeInfo&)
-      Add__19wxArrayFileTypeInfoFRC14wxFileTypeInfo
        ;wxFileTypeInfo::wxFileTypeInfo(const wxArrayString&)
        __ct__14wxFileTypeInfoFRC13wxArrayString
        ;wxMimeTypesManager::Initialize(int,const wxString&)
@@ -4197,16 +4228,20 @@ EXPORTS
        __ct__14wxFileTypeInfoFPCcN31e
        ;wxFileType::SetDefaultIcon(const wxString&,int)
        SetDefaultIcon__10wxFileTypeFRC8wxStringi
+      ;wxArrayFileTypeInfo::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__19wxArrayFileTypeInfoFUiT1
        ;wxArrayFileTypeInfo::DoCopy(const wxArrayFileTypeInfo&)
        DoCopy__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
        ;wxMimeTypesManager::ReadMimeTypes(const wxString&)
        ReadMimeTypes__18wxMimeTypesManagerFRC8wxString
        ;wxFileType::ExpandCommand(const wxString&,const wxFileType::MessageParameters&)
        ExpandCommand__10wxFileTypeFRC8wxStringRCQ2_10wxFileType17MessageParameters
-      ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
-      IsOfType__18wxMimeTypesManagerFRC8wxStringT1
+      ;wxArrayFileTypeInfo::Add(const wxFileTypeInfo&,unsigned int)
+      Add__19wxArrayFileTypeInfoFRC14wxFileTypeInfoUi
        ;wxMimeTypesManager::Unassociate(wxFileType*)
        Unassociate__18wxMimeTypesManagerFP10wxFileType
+      ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
+      IsOfType__18wxMimeTypesManagerFRC8wxStringT1
        ;wxArrayFileTypeInfo::DoEmpty()
        DoEmpty__19wxArrayFileTypeInfoFv
        wxTheMimeTypesManager
@@ -4228,8 +4263,6 @@ EXPORTS
        SetCommand__10wxFileTypeFRC8wxStringT1Ul
        ;wxMimeTypesManager::ReadMailcap(const wxString&,unsigned long)
        ReadMailcap__18wxMimeTypesManagerFRC8wxStringUl
-      ;wxArrayFileTypeInfo::Insert(const wxFileTypeInfo&,unsigned int)
-      Insert__19wxArrayFileTypeInfoFRC14wxFileTypeInfoUi
        ;wxFileType::~wxFileType()
        __dt__10wxFileTypeFv
        ;wxFileType::GetExtensions(wxArrayString&)
@@ -4238,18 +4271,18 @@ EXPORTS
        GetMimeTypes__10wxFileTypeCFR13wxArrayString
        ;wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo*)
        AddFallbacks__18wxMimeTypesManagerFPC14wxFileTypeInfo
-      ;wxArrayFileTypeInfo::RemoveAt(unsigned int)
-      RemoveAt__19wxArrayFileTypeInfoFUi
        ;wxMimeTypeCmnModule::sm_classwxMimeTypeCmnModule
        sm_classwxMimeTypeCmnModule__19wxMimeTypeCmnModule
-      ;wxFileType::Unassociate()
-      Unassociate__10wxFileTypeFv
+      ;wxArrayFileTypeInfo::Insert(const wxFileTypeInfo&,unsigned int,unsigned int)
+      Insert__19wxArrayFileTypeInfoFRC14wxFileTypeInfoUiT2
        ;wxConstructorForwxMimeTypeCmnModule()
        wxConstructorForwxMimeTypeCmnModule__Fv
        ;wxMimeTypesManager::~wxMimeTypesManager()
        __dt__18wxMimeTypesManagerFv
        ;wxMimeTypesManager::wxMimeTypesManager()
        __ct__18wxMimeTypesManagerFv
+      ;wxFileType::Unassociate()
+      Unassociate__10wxFileTypeFv
        ;wxMimeTypesManager::ClearData()
        ClearData__18wxMimeTypesManagerFv
        ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
@@ -4341,6 +4374,10 @@ EXPORTS
        CreateRefData__8wxObjectCFv
        ;wxClassInfo::sm_classTable
        sm_classTable__11wxClassInfo
+      ;wxObject::InitFrom(const wxObject&)
+      InitFrom__8wxObjectFRC8wxObject
+      ;wxObject::operator new(unsigned int,const char*,int)
+      __nw__8wxObjectFUiPCci
        ;wxObject::CloneRefData(const wxObjectRefData*) const
        CloneRefData__8wxObjectCFPC15wxObjectRefData
        ;wxClassInfo::sm_first
@@ -4360,8 +4397,6 @@ EXPORTS
        FindClass__11wxClassInfoFPCc
        ;wxObject::sm_classwxObject
        sm_classwxObject__8wxObject
-      ;wxObject::operator new(unsigned int,char*,int)
-      __nw__8wxObjectFUiPci
        ;wxClassInfo::InitializeClasses()
        InitializeClasses__11wxClassInfoFv
    ;From object file:  ..\common\odbc.cpp
@@ -4418,6 +4453,61 @@ EXPORTS
        ;wxPrintPaperDatabase::AddPaperType(wxPaperSize,const wxString&,int,int)
        AddPaperType__20wxPrintPaperDatabaseF11wxPaperSizeRC8wxStringiT3
    ;From object file:  ..\common\popupcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxPopupWindowHandler::OnLeftDown(wxMouseEvent&)
+      OnLeftDown__20wxPopupWindowHandlerFR12wxMouseEvent
+      __vft20wxPopupWindowHandler8wxObject
+      __vft19wxPopupFocusHandler8wxObject
+      __vft17wxPopupWindowBase8wxObject
+      ;wxPopupWindowHandler::sm_eventTableEntries
+      sm_eventTableEntries__20wxPopupWindowHandler
+      ;wxConstructorForwxPopupTransientWindow()
+      wxConstructorForwxPopupTransientWindow__Fv
+      ;wxPopupWindowHandler::sm_eventTable
+      sm_eventTable__20wxPopupWindowHandler
+      ;wxPopupWindowHandler::GetEventTable() const
+      GetEventTable__20wxPopupWindowHandlerCFv
+      ;wxPopupTransientWindow::Dismiss()
+      Dismiss__22wxPopupTransientWindowFv
+      ;wxPopupTransientWindow::sm_classwxPopupTransientWindow
+      sm_classwxPopupTransientWindow__22wxPopupTransientWindow
+      __vft22wxPopupTransientWindow8wxObject
+      ;wxPopupFocusHandler::GetEventTable() const
+      GetEventTable__19wxPopupFocusHandlerCFv
+      ;wxPopupFocusHandler::sm_eventTable
+      sm_eventTable__19wxPopupFocusHandler
+      ;wxPopupFocusHandler::sm_eventTableEntries
+      sm_eventTableEntries__19wxPopupFocusHandler
+      ;wxPopupTransientWindow::Popup(wxWindow*)
+      Popup__22wxPopupTransientWindowFP8wxWindow
+      ;wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent&)
+      ProcessLeftDown__22wxPopupTransientWindowFR12wxMouseEvent
+      ;wxPopupFocusHandler::OnKillFocus(wxFocusEvent&)
+      OnKillFocus__19wxPopupFocusHandlerFR12wxFocusEvent
+      ;wxPopupFocusHandler::OnKeyDown(wxKeyEvent&)
+      OnKeyDown__19wxPopupFocusHandlerFR10wxKeyEvent
+      ;wxPopupWindowBase::Create(wxWindow*,int)
+      Create__17wxPopupWindowBaseFP8wxWindowi
+      ;wxPopupWindowBase::~wxPopupWindowBase()
+      __dt__17wxPopupWindowBaseFv
+      ;wxConstructorForwxPopupWindow()
+      wxConstructorForwxPopupWindow__Fv
+      ;wxPopupTransientWindow::OnDismiss()
+      OnDismiss__22wxPopupTransientWindowFv
+      ;wxPopupTransientWindow::DismissAndNotify()
+      DismissAndNotify__22wxPopupTransientWindowFv
+      ;wxPopupWindowBase::Position(const wxPoint&,const wxSize&)
+      Position__17wxPopupWindowBaseFRC7wxPointRC6wxSize
+      ;wxPopupTransientWindow::wxPopupTransientWindow(wxWindow*,int)
+      __ct__22wxPopupTransientWindowFP8wxWindowi
+      ;wxPopupTransientWindow::Init()
+      Init__22wxPopupTransientWindowFv
+      ;wxPopupTransientWindow::~wxPopupTransientWindow()
+      __dt__22wxPopupTransientWindowFv
+      ;wxPopupTransientWindow::PopHandlers()
+      PopHandlers__22wxPopupTransientWindowFv
+      ;wxPopupWindow::sm_classwxPopupWindow
+      sm_classwxPopupWindow__13wxPopupWindow
    ;From object file:  ..\common\prntbase.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxPreviewControlBar::OnZoom(wxCommandEvent&)
@@ -4956,6 +5046,14 @@ EXPORTS
        __vft14wxSocketStream13wxInputStream12wxStreamBase
        ;wxSocketOutputStream::~wxSocketOutputStream()
        __dt__20wxSocketOutputStreamFv
+  ;From object file:  ..\common\settcmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxSystemSettings::ms_screen
+      ms_screen__16wxSystemSettings
+      ;wxSystemSettings::GetScreenType()
+      GetScreenType__16wxSystemSettingsFv
+      ;wxSystemSettings::SetScreenType(wxSystemScreenType)
+      SetScreenType__16wxSystemSettingsF18wxSystemScreenType
    ;From object file:  ..\common\sizer.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*)
@@ -4999,6 +5097,8 @@ EXPORTS
        Fit__7wxSizerFP8wxWindow
        ;wxSizer::GetMinWindowSize(wxWindow*)
        GetMinWindowSize__7wxSizerFP8wxWindow
+      ;wxSizer::FitInside(wxWindow*)
+      FitInside__7wxSizerFP8wxWindow
        ;wxSizer::Prepend(wxWindow*,int,int,int,wxObject*)
        Prepend__7wxSizerFP8wxWindowiN22P8wxObject
        __vft15wxFlexGridSizer8wxObject
@@ -5085,6 +5185,10 @@ EXPORTS
        DoSetItemMinSize__7wxSizerFP7wxSizeriT2
        ;wxSizerItem::DeleteWindows()
        DeleteWindows__11wxSizerItemFv
+      ;wxSizer::GetMinClientSize(wxWindow*)
+      GetMinClientSize__7wxSizerFP8wxWindow
+      ;wxSizer::GetMaxClientSize(wxWindow*)
+      GetMaxClientSize__7wxSizerFP8wxWindow
        ;wxSizerItem::wxSizerItem(wxWindow*,int,int,int,wxObject*)
        __ct__11wxSizerItemFP8wxWindowiN22P8wxObject
        __vft16wxStaticBoxSizer8wxObject
@@ -5109,8 +5213,12 @@ EXPORTS
        SetItemBounds__11wxGridSizerFP11wxSizerItemiN32
        ;wxGridSizer::CalcMin()
        CalcMin__11wxGridSizerFv
+      ;wxSizer::VirtualFitSize(wxWindow*)
+      VirtualFitSize__7wxSizerFP8wxWindow
        ;wxNotebookSizer::wxNotebookSizer(wxNotebook*)
        __ct__15wxNotebookSizerFP10wxNotebook
+      ;wxSizer::SetVirtualSizeHints(wxWindow*)
+      SetVirtualSizeHints__7wxSizerFP8wxWindow
    ;From object file:  ..\common\socket.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxSocketBase::SetTimeout(long)
@@ -5228,25 +5336,40 @@ EXPORTS
        GetLocal__12wxSocketBaseCFR13wxSockAddress
    ;From object file:  ..\common\statbar.cpp
      ;PUBDEFs (Symbols available from object file):
+      ;wxStatusBarBase::PopStatusText(int)
+      PopStatusText__15wxStatusBarBaseFi
        ;wxStatusBarBase::FreeWidths()
        FreeWidths__15wxStatusBarBaseFv
        __vft15wxStatusBarBase8wxObject
+      ;wxStatusBarBase::GetStatusStack(int) const
+      GetStatusStack__15wxStatusBarBaseCFi
        ;wxStatusBarBase::InitWidths()
        InitWidths__15wxStatusBarBaseFv
        ;wxStatusBar::sm_classwxStatusBar
        sm_classwxStatusBar__11wxStatusBar
        ;wxStatusBarBase::~wxStatusBarBase()
        __dt__15wxStatusBarBaseFv
+      ;wxStatusBarBase::InitStacks()
+      InitStacks__15wxStatusBarBaseFv
+      ;wxwxListStringNode::DeleteData()
+      DeleteData__18wxwxListStringNodeFv
        ;wxStatusBarBase::SetStatusWidths(int,const int*)
        SetStatusWidths__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::GetOrCreateStatusStack(int)
+      GetOrCreateStatusStack__15wxStatusBarBaseFi
        ;wxStatusBarBase::CalculateAbsWidths(int) const
        CalculateAbsWidths__15wxStatusBarBaseCFi
        ;wxStatusBarBase::wxStatusBarBase()
        __ct__15wxStatusBarBaseFv
        ;wxStatusBarBase::SetFieldsCount(int,const int*)
        SetFieldsCount__15wxStatusBarBaseFiPCi
+      ;wxStatusBarBase::PushStatusText(const wxString&,int)
+      PushStatusText__15wxStatusBarBaseFRC8wxStringi
+      ;wxStatusBarBase::FreeStacks()
+      FreeStacks__15wxStatusBarBaseFv
        ;wxConstructorForwxStatusBar()
        wxConstructorForwxStatusBar__Fv
+      __vft18wxwxListStringNode10wxNodeBase
    ;From object file:  ..\common\strconv.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxStrConvModule::sm_classwxStrConvModule
@@ -5467,8 +5590,10 @@ EXPORTS
        Sort__13wxArrayStringFPFRC8wxStringT1_i
        ;wxArrayString::SetCount(unsigned int)
        SetCount__13wxArrayStringFUi
-      ;wxArrayString::Remove(unsigned int)
-      Remove__13wxArrayStringFUi
+      ;wxArrayString::Remove(unsigned int,unsigned int)
+      Remove__13wxArrayStringFUiT1
+      ;wxArrayString::Grow(unsigned int)
+      Grow__13wxArrayStringFUi
        ;wxString::Format(const char*,...)
        Format__8wxStringFPCce
        ;wxString::Alloc(unsigned int)
@@ -5477,8 +5602,6 @@ EXPORTS
        IsAscii__8wxStringCFv
        ;wxString::IsWord() const
        IsWord__8wxStringCFv
-      ;wxArrayString::Grow()
-      Grow__13wxArrayStringFv
        ;wxArrayString::DoSort()
        DoSort__13wxArrayStringFv
        ;operator+(char,const wxString&)
@@ -5549,14 +5672,14 @@ EXPORTS
        UngetWriteBuf__8wxStringFUi
        ;wxString::ToLong(long*,int) const
        ToLong__8wxStringCFPli
-      ;wxArrayString::Insert(const wxString&,unsigned int)
-      Insert__13wxArrayStringFRC8wxStringUi
        ;wxString::GetWriteBuf(unsigned int)
        GetWriteBuf__8wxStringFUi
        ;wxString::AllocBuffer(unsigned int)
        AllocBuffer__8wxStringFUi
        ;wxString::AllocBeforeWrite(unsigned int)
        AllocBeforeWrite__8wxStringFUi
+      ;wxArrayString::Add(const wxString&,unsigned int)
+      Add__13wxArrayStringFRC8wxStringUi
        ;wxString::InitWith(const char*,unsigned int,unsigned int)
        InitWith__8wxStringFPCcUiT2
        wxStringCompareFunction
@@ -5582,8 +5705,6 @@ EXPORTS
        Remove__13wxArrayStringFPCc
        ;wxString::ConcatSelf(int,const char*)
        ConcatSelf__8wxStringFiPCc
-      ;wxArrayString::Add(const wxString&)
-      Add__13wxArrayStringFRC8wxString
        ;wxString::erase(unsigned int,unsigned int)
        erase__8wxStringFUiT1
        ;wxString::sprintf(const char*,...)
@@ -5630,6 +5751,8 @@ EXPORTS
        __dt__13wxArrayStringFv
        ;wxString::Lower() const
        Lower__8wxStringCFv
+      ;wxArrayString::Insert(const wxString&,unsigned int,unsigned int)
+      Insert__13wxArrayStringFRC8wxStringUiT2
        ;wxArrayString::Free()
        Free__13wxArrayStringFv
        ;wxArrayString::Clear()
@@ -5690,12 +5813,14 @@ EXPORTS
        InsertTool__13wxToolBarBaseFUiiRC8wxStringRC8wxBitmapT410wxItemKindN23P8wxObject
        ;wxToolBarBase::InsertControl(unsigned int,wxControl*)
        InsertControl__13wxToolBarBaseFUiP9wxControl
-      ;wxToolBarBase::SetMargins(int,int)
-      SetMargins__13wxToolBarBaseFiT1
+      ;wxToolBarBase::FindControl(int)
+      FindControl__13wxToolBarBaseFi
        ;wxToolBarBase::sm_eventTableEntries
        sm_eventTableEntries__13wxToolBarBase
        ;wxToolBarBase::SetRows(int)
        SetRows__13wxToolBarBaseFi
+      ;wxToolBarBase::SetMargins(int,int)
+      SetMargins__13wxToolBarBaseFiT1
        ;wxToolBarToolBase::SetLongHelp(const wxString&)
        SetLongHelp__17wxToolBarToolBaseFRC8wxString
        ;wxToolBarBase::SetToolShortHelp(int,const wxString&)
@@ -6236,6 +6361,8 @@ EXPORTS
        __ct__15wxTextValidatorFlP8wxString
        ;wxTextValidator::Validate(wxWindow*)
        Validate__15wxTextValidatorFP8wxWindow
+      ;wxTextValidator::IsNotInCharExcludeList(const wxString&)
+      IsNotInCharExcludeList__15wxTextValidatorFRC8wxString
        ;wxConstructorForwxTextValidator()
        wxConstructorForwxTextValidator__Fv
        ;wxTextValidator::sm_eventTable
@@ -6245,6 +6372,8 @@ EXPORTS
        ;wxTextValidator::SetIncludeList(const wxStringList&)
        SetIncludeList__15wxTextValidatorFRC12wxStringList
        __vft15wxTextValidator8wxObject
+      ;wxTextValidator::IsInCharIncludeList(const wxString&)
+      IsInCharIncludeList__15wxTextValidatorFRC8wxString
        ;wxTextValidator::SetExcludeList(const wxStringList&)
        SetExcludeList__15wxTextValidatorFRC12wxStringList
        ;wxTextValidator::OnChar(wxKeyEvent&)
@@ -6868,6 +6997,8 @@ EXPORTS
        ConvertPixelsToDialog__12wxWindowBaseFRC7wxPoint
        ;wxWindowBase::SetSizer(wxSizer*,unsigned long)
        SetSizer__12wxWindowBaseFP7wxSizerUl
+      ;wxWindowBase::SetSizerAndFit(wxSizer*,unsigned long)
+      SetSizerAndFit__12wxWindowBaseFP7wxSizerUl
        ;wxWindowBase::FindWindow(long)
        FindWindow__12wxWindowBaseFl
        ;wxWindowBase::IsExposed(int,int) const
@@ -6877,6 +7008,8 @@ EXPORTS
        ;wxWindowBase::sm_classwxWindowBase
        sm_classwxWindowBase__12wxWindowBase
        __vft16wxWindowListNode10wxNodeBase
+      ;wxWindowBase::SetVirtualSizeHints(int,int,int,int)
+      SetVirtualSizeHints__12wxWindowBaseFiN31
        ;wxWindowBase::SetSizeHints(int,int,int,int,int,int)
        SetSizeHints__12wxWindowBaseFiN51
        ;wxWindowBase::MoveConstraint(int,int)
@@ -6913,6 +7046,8 @@ EXPORTS
        SetSizeConstraint__12wxWindowBaseFiN31
        ;wxWindowBase::GetClientSizeConstraint(int*,int*) const
        GetClientSizeConstraint__12wxWindowBaseCFPiT1
+      ;wxWindowBase::DoSetVirtualSize(int,int)
+      DoSetVirtualSize__12wxWindowBaseFiT1
        ;wxWindowBase::DoHitTest(int,int) const
        DoHitTest__12wxWindowBaseCFiT1
        ;wxWindowBase::DoGetBestSize() const
@@ -6927,6 +7062,12 @@ EXPORTS
        GetHelpText__12wxWindowBaseCFv
        ;wxWindowBase::GetAncestorWithCustomPalette() const
        GetAncestorWithCustomPalette__12wxWindowBaseCFv
+      ;wxWindowBase::FindWindowByLabel(const wxString&,const wxWindow*)
+      FindWindowByLabel__12wxWindowBaseFRC8wxStringPC8wxWindow
+      ;wxWindowBase::FindWindowByName(const wxString&,const wxWindow*)
+      FindWindowByName__12wxWindowBaseFRC8wxStringPC8wxWindow
+      ;wxWindowBase::FindWindowById(long,const wxWindow*)
+      FindWindowById__12wxWindowBaseFlPC8wxWindow
        ;wxWindowBase::SetFont(const wxFont&)
        SetFont__12wxWindowBaseFRC6wxFont
        ;wxWindowBase::MakeModal(unsigned long)
@@ -6943,6 +7084,8 @@ EXPORTS
        InitBase__12wxWindowBaseFv
        ;wxWindowBase::SetCursor(const wxCursor&)
        SetCursor__12wxWindowBaseFRC8wxCursor
+      ;wxWindowBase::SatisfyConstraints()
+      SatisfyConstraints__12wxWindowBaseFv
        ;wxWindowBase::ResetConstraints()
        ResetConstraints__12wxWindowBaseFv
        ;wxWindowBase::GetDefaultBorder() const
@@ -6953,10 +7096,14 @@ EXPORTS
        GetBorder__12wxWindowBaseCFv
        ;wxWindowBase::Fit()
        Fit__12wxWindowBaseFv
+      ;wxWindowBase::DoGetVirtualSize() const
+      DoGetVirtualSize__12wxWindowBaseCFv
        ;wxWindowBase::DeleteRelatedConstraints()
        DeleteRelatedConstraints__12wxWindowBaseFv
        ;wxWindowBase::SetHelpText(const wxString&)
        SetHelpText__12wxWindowBaseFRC8wxString
+      ;wxGetTopLevelParent(wxWindow*)
+      wxGetTopLevelParent__FP8wxWindow
    ;From object file:  ..\common\wxchar.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxOKlibc()
@@ -7150,6 +7297,24 @@ EXPORTS
        __vft16wxZipInputStream12wxStreamBase
        ;wxZipInputStream::Eof() const
        Eof__16wxZipInputStreamCFv
+  ;From object file:  ..\common\zstream.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxZlibInputStream::wxZlibInputStream(wxInputStream&)
+      __ct__17wxZlibInputStreamFR13wxInputStream
+      ;wxZlibOutputStream::wxZlibOutputStream(wxOutputStream&,int)
+      __ct__18wxZlibOutputStreamFR14wxOutputStreami
+      ;wxZlibInputStream::OnSysRead(void*,unsigned int)
+      OnSysRead__17wxZlibInputStreamFPvUi
+      ;wxZlibOutputStream::Sync()
+      Sync__18wxZlibOutputStreamFv
+      ;wxZlibOutputStream::OnSysWrite(const void*,unsigned int)
+      OnSysWrite__18wxZlibOutputStreamFPCvUi
+      __vft18wxZlibOutputStream12wxStreamBase
+      ;wxZlibInputStream::~wxZlibInputStream()
+      __dt__17wxZlibInputStreamFv
+      ;wxZlibOutputStream::~wxZlibOutputStream()
+      __dt__18wxZlibOutputStreamFv
+      __vft17wxZlibInputStream12wxStreamBase
    ;From object file:  ..\generic\busyinfo.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxBusyInfo::~wxBusyInfo()
@@ -7706,12 +7871,16 @@ EXPORTS
        SetFilterIndex__16wxGenericDirCtrlFi
        ;wxDirFilterListCtrl::FillFilterList(const wxString&,int)
        FillFilterList__19wxDirFilterListCtrlFRC8wxStringi
+      ;wxGenericDirCtrl::ReCreateTree()
+      ReCreateTree__16wxGenericDirCtrlFv
        ;wxGenericDirCtrl::SetupSections()
        SetupSections__16wxGenericDirCtrlFv
        ;wxGenericDirCtrl::ShowHidden(unsigned long)
        ShowHidden__16wxGenericDirCtrlFUl
        ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&)
        OnCollapseItem__16wxGenericDirCtrlFR11wxTreeEvent
+      ;wxGenericDirCtrl::CollapseDir(wxTreeItemId)
+      CollapseDir__16wxGenericDirCtrlF12wxTreeItemId
        ;wxDirItemData::HasSubDirs() const
        HasSubDirs__13wxDirItemDataCFv
        ;wxGenericDirCtrl::GetPath() const
@@ -7751,12 +7920,10 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
        OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent
-      ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,wxFontData*)
-      __ct__19wxGenericFontDialogFP8wxWindowP10wxFontData
+      ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,const wxFontData&)
+      __ct__19wxGenericFontDialogFP8wxWindowRC10wxFontData
        ;wxFontStyleIntToString(int)
        wxFontStyleIntToString__Fi
-      ;wxGenericFontDialog::Create(wxWindow*,wxFontData*)
-      Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
        ;wxGenericFontDialog::GetEventTable() const
        GetEventTable__19wxGenericFontDialogCFv
        ;wxFontPreviewer::sm_eventTable
@@ -7773,6 +7940,8 @@ EXPORTS
        OnPaint__15wxFontPreviewerFR12wxPaintEvent
        ;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
        OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
+      ;wxGenericFontDialog::Create(wxWindow*,const wxFontData&)
+      Create__19wxGenericFontDialogFP8wxWindowRC10wxFontData
        ;wxGenericFontDialog::ShowModal()
        ShowModal__19wxGenericFontDialogFv
        ;wxGenericFontDialog::sm_eventTableEntries
@@ -7884,14 +8053,8 @@ EXPORTS
        SetRowAttr__15wxGridTableBaseFP14wxGridCellAttri
        ;wxGrid::SetColMinimalWidth(int,int)
        SetColMinimalWidth__6wxGridFiT1
-      ;wxGridCellWithAttrArray::RemoveAt(unsigned int)
-      RemoveAt__23wxGridCellWithAttrArrayFUi
-      ;wxGridStringArray::RemoveAt(unsigned int)
-      RemoveAt__17wxGridStringArrayFUi
        ;wxGrid::ProcessTableMessage(wxGridTableMessage&)
        ProcessTableMessage__6wxGridFR18wxGridTableMessage
-      ;wxGridCellCoordsArray::Insert(const wxGridCellCoords&,unsigned int)
-      Insert__21wxGridCellCoordsArrayFRC16wxGridCellCoordsUi
        ;wxGridStringTable::InsertRows(unsigned int,unsigned int)
        InsertRows__17wxGridStringTableFUiT1
        ;wxGridTableBase::GetValueAsBool(int,int)
@@ -7912,6 +8075,8 @@ EXPORTS
        DeselectCol__6wxGridFi
        ;wxGridTableBase::AppendCols(unsigned int)
        AppendCols__15wxGridTableBaseFUi
+      ;wxGridCellWithAttrArray::Add(const wxGridCellWithAttr&,unsigned int)
+      Add__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttrUi
        ;wxGridCellAttr::Init(wxGridCellAttr*)
        Init__14wxGridCellAttrFP14wxGridCellAttr
        wxEVT_GRID_EDITOR_SHOWN
@@ -7919,7 +8084,8 @@ EXPORTS
        wxConstructorForwxGridEditorCreatedEvent__Fv
        ;wxConstructorForwxGridCornerLabelWindow()
        wxConstructorForwxGridCornerLabelWindow__Fv
-      __vft24wxGridCellStringRenderer16wxGridCellWorker
+      __vft22wxGridCellNumberEditor21wxClientDataContainer
+      __vft22wxGridCellBoolRenderer21wxClientDataContainer
        ;wxGrid::~wxGrid()
        __dt__6wxGridFv
        ;wxGridCellWithAttrArray::~wxGridCellWithAttrArray()
@@ -8056,14 +8222,12 @@ EXPORTS
        SetColAttr__15wxGridTableBaseFP14wxGridCellAttri
        ;wxGridRowOrColAttrData::SetAttr(wxGridCellAttr*,int)
        SetAttr__22wxGridRowOrColAttrDataFP14wxGridCellAttri
-      ;wxGridCellCoordsArray::RemoveAt(unsigned int)
-      RemoveAt__21wxGridCellCoordsArrayFUi
+      ;wxGridCellWithAttrArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__23wxGridCellWithAttrArrayFUiT1
        ;wxGrid::MakeCellVisible(int,int)
        MakeCellVisible__6wxGridFiT1
        ;wxGrid::IsInSelection(int,int)
        IsInSelection__6wxGridFiT1
-      ;wxGridStringArray::Insert(const wxArrayString&,unsigned int)
-      Insert__17wxGridStringArrayFRC13wxArrayStringUi
        ;wxGridTableBase::InsertRows(unsigned int,unsigned int)
        InsertRows__15wxGridTableBaseFUiT1
        ;wxGridStringTable::GetValue(int,int)
@@ -8098,6 +8262,8 @@ EXPORTS
        AppendRows__15wxGridTableBaseFUi
        ;wxGridStringTable::AppendCols(unsigned int)
        AppendCols__17wxGridStringTableFUi
+      ;wxGridStringArray::Add(const wxArrayString&,unsigned int)
+      Add__17wxGridStringArrayFRC13wxArrayStringUi
        ;wxGrid::SetDefaultCellBackgroundColour(const wxColour&)
        SetDefaultCellBackgroundColour__6wxGridFRC8wxColour
        wxEVT_GRID_EDITOR_HIDDEN
@@ -8110,9 +8276,11 @@ EXPORTS
        ;wxGridCellBoolRenderer::ms_sizeCheckMark
        ms_sizeCheckMark__22wxGridCellBoolRenderer
        __vft6wxGrid14wxScrollHelper
-      __vft24wxGridCellNumberRenderer16wxGridCellWorker
-      __vft22wxGridCellBoolRenderer16wxGridCellWorker
-      __vft20wxGridCellTextEditor16wxGridCellWorker
+      __vft22wxGridCellChoiceEditor21wxClientDataContainer
+      __vft22wxGridCellAttrProvider21wxClientDataContainer
+      __vft21wxGridCellFloatEditor21wxClientDataContainer
+      __vft20wxGridCellTextEditor21wxClientDataContainer
+      __vft15wxGridTableBase21wxClientDataContainer
        ;wxGridCellAttrProvider::~wxGridCellAttrProvider()
        __dt__22wxGridCellAttrProviderFv
        ;wxGridTypeRegistry::~wxGridTypeRegistry()
@@ -8139,6 +8307,12 @@ EXPORTS
        MergeWith__14wxGridCellAttrFP14wxGridCellAttr
        ;wxGrid::IsCurrentCellReadOnly() const
        IsCurrentCellReadOnly__6wxGridCFv
+      ;wxGridCellWithAttrArray::Insert(const wxGridCellWithAttr&,unsigned int,unsigned int)
+      Insert__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttrUiT2
+      ;wxGridCellCoordsArray::Insert(const wxGridCellCoords&,unsigned int,unsigned int)
+      Insert__21wxGridCellCoordsArrayFRC16wxGridCellCoordsUiT2
+      ;wxGridStringArray::Insert(const wxArrayString&,unsigned int,unsigned int)
+      Insert__17wxGridStringArrayFRC13wxArrayStringUiT2
        ;wxGridCellAttr::GetTextColour() const
        GetTextColour__14wxGridCellAttrCFv
        ;wxGridCellNumberRenderer::GetString(wxGrid&,int,int)
@@ -8163,8 +8337,6 @@ EXPORTS
        CalcWindowSizes__6wxGridFv
        ;wxGrid::CalcRowLabelsExposed(const wxRegion&)
        CalcRowLabelsExposed__6wxGridFRC8wxRegion
-      ;wxGridCellWithAttrArray::Add(const wxGridCellWithAttr&)
-      Add__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttr
        ;wxGrid::SetCurrentCell(const wxGridCellCoords&)
        SetCurrentCell__6wxGridFRC16wxGridCellCoords
        wxGridNoCellCoords
@@ -8185,10 +8357,6 @@ EXPORTS
        DrawCellBorder__6wxGridFR4wxDCRC16wxGridCellCoords
        ;wxGridCellStringRenderer::DoGetBestSize(wxGridCellAttr&,wxDC&,const wxString&)
        DoGetBestSize__24wxGridCellStringRendererFR14wxGridCellAttrR4wxDCRC8wxString
-      ;wxGridCellCoordsArray::Add(const wxGridCellCoords&)
-      Add__21wxGridCellCoordsArrayFRC16wxGridCellCoords
-      ;wxGridStringArray::Add(const wxArrayString&)
-      Add__17wxGridStringArrayFRC13wxArrayString
        ;wxGrid::EnableCellEditControl(unsigned long)
        EnableCellEditControl__6wxGridFUl
        wxEVT_GRID_EDITOR_CREATED
@@ -8277,6 +8445,8 @@ EXPORTS
        SetRowLabelSize__6wxGridFi
        ;wxGrid::SetCellHighlightROPenWidth(int)
        SetCellHighlightROPenWidth__6wxGridFi
+      ;wxGridStringArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__17wxGridStringArrayFUiT1
        ;wxGrid::Redimension(wxGridTableMessage&)
        Redimension__6wxGridFR18wxGridTableMessage
        ;wxGrid::IsReadOnly(int,int) const
@@ -8307,11 +8477,9 @@ EXPORTS
        wxConstructorForwxGridRowLabelWindow__Fv
        ;wxGridCellEditorEvtHandler::sm_classwxGridCellEditorEvtHandler
        sm_classwxGridCellEditorEvtHandler__26wxGridCellEditorEvtHandler
-      __vft22wxGridCellNumberEditor16wxGridCellWorker
-      __vft22wxGridCellAttrProvider
-      __vft21wxGridCellFloatEditor16wxGridCellWorker
-      __vft20wxGridCellBoolEditor16wxGridCellWorker
-      __vft16wxGridCellWorker
+      __vft24wxGridCellStringRenderer21wxClientDataContainer
+      __vft24wxGridCellNumberRenderer21wxClientDataContainer
+      __vft20wxGridCellBoolEditor21wxClientDataContainer
        ;wxGridStringTable::~wxGridStringTable()
        __dt__17wxGridStringTableFv
        ;wxGridWindow::~wxGridWindow()
@@ -8491,11 +8659,14 @@ EXPORTS
        GetCellFont__6wxGridFiT1
        ;wxGrid::DeselectRow(int)
        DeselectRow__6wxGridFi
+      ;wxGridCellCoordsArray::Add(const wxGridCellCoords&,unsigned int)
+      Add__21wxGridCellCoordsArrayFRC16wxGridCellCoordsUi
        ;wxGridCellEditor::~wxGridCellEditor()
        __dt__16wxGridCellEditorFv
        ;wxConstructorForwxGridStringTable()
        wxConstructorForwxGridStringTable__Fv
-      __vft16wxGridCellEditor16wxGridCellWorker
+      __vft17wxGridStringTable21wxClientDataContainer
+      __vft16wxGridCellEditor21wxClientDataContainer
        ;wxGridStringTable::wxGridStringTable()
        __ct__17wxGridStringTableFv
        ;wxGrid::ShowCellEditControl()
@@ -8633,8 +8804,8 @@ EXPORTS
        SetColFormatNumber__6wxGridFi
        ;wxGrid::SetCellHighlightPenWidth(int)
        SetCellHighlightPenWidth__6wxGridFi
-      ;wxGridCellWithAttrArray::Insert(const wxGridCellWithAttr&,unsigned int)
-      Insert__23wxGridCellWithAttrArrayFRC18wxGridCellWithAttrUi
+      ;wxGridCellCoordsArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__21wxGridCellCoordsArrayFUiT1
        ;wxGridStringTable::InsertCols(unsigned int,unsigned int)
        InsertCols__17wxGridStringTableFUiT1
        ;wxGridTableBase::GetValueAsDouble(int,int)
@@ -8681,8 +8852,8 @@ EXPORTS
        wxConstructorForwxGridColLabelWindow__Fv
        ;wxGridCellEditorEvtHandler::sm_eventTableEntries
        sm_eventTableEntries__26wxGridCellEditorEvtHandler
-      __vft23wxGridCellFloatRenderer16wxGridCellWorker
-      __vft22wxGridCellChoiceEditor16wxGridCellWorker
+      __vft23wxGridCellFloatRenderer21wxClientDataContainer
+      __vft16wxGridCellWorker21wxClientDataContainer
        ;wxGridRowOrColAttrData::~wxGridRowOrColAttrData()
        __dt__22wxGridRowOrColAttrDataFv
        ;wxGridCellCoordsArray::~wxGridCellCoordsArray()
@@ -8771,11 +8942,12 @@ EXPORTS
        Draw__22wxGridCellEnumRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
        ;wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString,wxString)
        __ct__26wxGridCellDateTimeRendererF8wxStringT1
+      __vft20wxGridCellEnumEditor21wxClientDataContainer
        ;wxGridCellDateTimeRenderer::Draw(wxGrid&,wxGridCellAttr&,wxDC&,const wxRect&,int,int,unsigned long)
        Draw__26wxGridCellDateTimeRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
        ;wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid&,wxGridCellAttr&,wxDC&,int,int)
        GetBestSize__32wxGridCellAutoWrapStringRendererFR6wxGridR14wxGridCellAttrR4wxDCiT4
-      __vft32wxGridCellAutoWrapStringRenderer16wxGridCellWorker
+      __vft22wxGridCellEnumRenderer21wxClientDataContainer
        ;wxGridCellDateTimeRenderer::SetParameters(const wxString&)
        SetParameters__26wxGridCellDateTimeRendererFRC8wxString
        ;wxGridCellEnumRenderer::SetParameters(const wxString&)
@@ -8788,8 +8960,8 @@ EXPORTS
        Draw__32wxGridCellAutoWrapStringRendererFR6wxGridR14wxGridCellAttrR4wxDCRC6wxRectiT5Ul
        ;wxGridCellDateTimeRenderer::Clone() const
        Clone__26wxGridCellDateTimeRendererCFv
-      __vft22wxGridCellEnumRenderer16wxGridCellWorker
-      __vft20wxGridCellEnumEditor16wxGridCellWorker
+      __vft30wxGridCellAutoWrapStringEditor21wxClientDataContainer
+      __vft26wxGridCellDateTimeRenderer21wxClientDataContainer
        ;wxGridCellDateTimeRenderer::GetString(wxGrid&,int,int)
        GetString__26wxGridCellDateTimeRendererFR6wxGridiT2
        ;wxGridCellEnumRenderer::GetString(wxGrid&,int,int)
@@ -8806,8 +8978,7 @@ EXPORTS
        GetTextLines__32wxGridCellAutoWrapStringRendererFR6wxGridR4wxDCR14wxGridCellAttrRC6wxRectiT5
        ;wxGridCellEnumRenderer::Clone() const
        Clone__22wxGridCellEnumRendererCFv
-      __vft30wxGridCellAutoWrapStringEditor16wxGridCellWorker
-      __vft26wxGridCellDateTimeRenderer16wxGridCellWorker
+      __vft32wxGridCellAutoWrapStringRenderer21wxClientDataContainer
    ;From object file:  ..\generic\gridsel.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxGridSelection::SelectBlock(int,int,int,int,unsigned long,unsigned long,unsigned long,unsigned long,unsigned long)
@@ -9098,12 +9269,16 @@ EXPORTS
        __dt__16wxListMainWindowFv
        ;wxListHeaderWindow::wxListHeaderWindow()
        __ct__18wxListHeaderWindowFv
+      ;wxListCtrl::SetItemTextColour(long,const wxColour&)
+      SetItemTextColour__10wxListCtrlFlRC8wxColour
        ;wxListLineData::SetAttr(wxListItemAttr*)
        SetAttr__14wxListLineDataFP14wxListItemAttr
        ;wxListMainWindow::RefreshSelected()
        RefreshSelected__16wxListMainWindowFv
        ;wxListMainWindow::OnRenameTimer()
        OnRenameTimer__16wxListMainWindowFv
+      ;wxListLineDataArray::Insert(const wxListLineData&,unsigned int,unsigned int)
+      Insert__19wxListLineDataArrayFRC14wxListLineDataUiT2
        ;wxListItemData::GetX() const
        GetX__14wxListItemDataCFv
        ;wxListCtrl::GetTextColour() const
@@ -9114,8 +9289,6 @@ EXPORTS
        GetEventTable__14wxListTextCtrlCFv
        ;wxListMainWindow::DoDeleteAllItems()
        DoDeleteAllItems__16wxListMainWindowFv
-      ;wxListItem::ClearAttributes()
-      ClearAttributes__10wxListItemFv
        ;wxListLineData::wxListLineData(wxListMainWindow*)
        __ct__14wxListLineDataFP16wxListMainWindow
        wxEVT_COMMAND_LIST_SET_INFO
@@ -9158,6 +9331,10 @@ EXPORTS
        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)
@@ -9178,8 +9355,6 @@ EXPORTS
        SetFormat__16wxListHeaderDataFi
        ;wxListCtrl::SetColumnWidth(int,int)
        SetColumnWidth__10wxListCtrlFiT1
-      ;wxListLineDataArray::RemoveAt(unsigned int)
-      RemoveAt__19wxListLineDataArrayFUi
        ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
        RefreshLines__16wxListMainWindowFUiT1
        ;wxListCtrl::InsertItem(long,int)
@@ -9214,6 +9389,8 @@ EXPORTS
        Thaw__10wxListCtrlFv
        ;wxListCtrl::SetItem(long,int,const wxString&,int)
        SetItem__10wxListCtrlFliRC8wxStringT2
+      ;wxListCtrl::SetItemBackgroundColour(long,const wxColour&)
+      SetItemBackgroundColour__10wxListCtrlFlRC8wxColour
        ;wxListMainWindow::SetFocus()
        SetFocus__16wxListMainWindowFv
        ;wxListMainWindow::InitScrolling()
@@ -9321,8 +9498,8 @@ EXPORTS
        DeleteColumn__16wxListMainWindowFi
        ;wxListLineData::CalculateSize(wxDC*,int)
        CalculateSize__14wxListLineDataFP4wxDCi
-      ;wxListItem::wxListItem()
-      __ct__10wxListItemFv
+      ;wxListCtrl::~wxListCtrl()
+      __dt__10wxListCtrlFv
        wxSizeTCmpFn
        ;wxConstructorForwxListItem()
        wxConstructorForwxListItem__Fv
@@ -9330,8 +9507,6 @@ EXPORTS
        __dt__19wxListLineDataArrayFv
        ;wxListItemData::~wxListItemData()
        __dt__14wxListItemDataFv
-      ;wxListCtrl::~wxListCtrl()
-      __dt__10wxListCtrlFv
        ;wxListCtrl::SetItemImage(long,int,int)
        SetItemImage__10wxListCtrlFliT2
        ;wxListCtrl::SetForegroundColour(const wxColour&)
@@ -9418,12 +9593,12 @@ EXPORTS
        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
-      ;wxListLineDataArray::Insert(const wxListLineData&,unsigned int)
-      Insert__19wxListLineDataArrayFRC14wxListLineDataUi
        ;wxListMainWindow::InsertItem(wxListItem&)
        InsertItem__16wxListMainWindowFR10wxListItem
        ;wxListCtrl::InsertItem(long,const wxString&,int)
@@ -9444,8 +9619,8 @@ EXPORTS
        FindItem__10wxListCtrlFlRC7wxPointi
        ;wxListCtrl::AssignImageList(wxImageList*,int)
        AssignImageList__10wxListCtrlFP11wxImageListi
-      ;wxListLineDataArray::Add(const wxListLineData&)
-      Add__19wxListLineDataArrayFRC14wxListLineData
+      ;wxListLineDataArray::Add(const wxListLineData&,unsigned int)
+      Add__19wxListLineDataArrayFRC14wxListLineDataUi
        ;wxListCtrl::wxListCtrl()
        __ct__10wxListCtrlFv
        ;wxConstructorForwxListView()
@@ -9484,8 +9659,6 @@ EXPORTS
        DoEmpty__19wxListLineDataArrayFv
        ;wxListCtrl::DeleteAllItems()
        DeleteAllItems__10wxListCtrlFv
-      ;wxListItem::Clear()
-      Clear__10wxListItemFv
        ;wxListCtrl::ClearAll()
        ClearAll__10wxListCtrlFv
        ;wxListItemData::wxListItemData(wxListMainWindow*)
@@ -9612,6 +9785,8 @@ EXPORTS
        Init__7wxPanelFv
        ;wxPanel::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
        Create__7wxPanelFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
+      ;wxPanel::SetTmpDefaultItem(wxWindow*)
+      SetTmpDefaultItem__7wxPanelFP8wxWindow
        ;wxPanel::SetDefaultItem(wxWindow*)
        SetDefaultItem__7wxPanelFP8wxWindow
        __vft7wxPanel8wxObject
@@ -9844,6 +10019,8 @@ EXPORTS
        GetScrollPixelsPerUnit__14wxScrollHelperCFPiT1
        ;wxScrollHelper::Scroll(int,int)
        Scroll__14wxScrollHelperFiT1
+      ;wxGenericScrolledWindow::DoSetVirtualSize(int,int)
+      DoSetVirtualSize__23wxGenericScrolledWindowFiT1
        ;wxScrollHelper::~wxScrollHelper()
        __dt__14wxScrollHelperFv
        ;wxConstructorForwxGenericScrolledWindow()
@@ -9859,8 +10036,8 @@ EXPORTS
        HandleOnSize__14wxScrollHelperFR11wxSizeEvent
        ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
        HandleOnPaint__14wxScrollHelperFR12wxPaintEvent
-      ;wxScrollHelper::GetVirtualSize(int*,int*) const
-      GetVirtualSize__14wxScrollHelperCFPiT1
+      ;wxScrollHelper::SetScrollRate(int,int)
+      SetScrollRate__14wxScrollHelperFiT1
        ;wxScrollHelper::GetTargetWindow() const
        GetTargetWindow__14wxScrollHelperCFv
        __vft14wxScrollHelper
@@ -9926,12 +10103,16 @@ EXPORTS
        InitColours__16wxSplitterWindowFv
        ;wxSplitterWindow::SetDefaultItem(wxWindow*)
        SetDefaultItem__16wxSplitterWindowFP8wxWindow
+      ;wxSplitterWindow::SetTmpDefaultItem(wxWindow*)
+      SetTmpDefaultItem__16wxSplitterWindowFP8wxWindow
        ;wxSplitterWindow::OnFocus(wxFocusEvent&)
        OnFocus__16wxSplitterWindowFR12wxFocusEvent
        wxEVT_COMMAND_SPLITTER_UNSPLIT
        __vft16wxSplitterWindow8wxObject
        ;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int)
        DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i
+      ;wxSplitterWindow::SetSashPositionAndNotify(int)
+      SetSashPositionAndNotify__16wxSplitterWindowFi
        ;wxSplitterWindow::SetMinimumPaneSize(int)
        SetMinimumPaneSize__16wxSplitterWindowFi
        ;wxSplitterWindow::OnSashPositionChange(int)
@@ -10194,6 +10375,43 @@ EXPORTS
        ;wxTipDialog::wxTipDialog(wxWindow*,wxTipProvider*,unsigned long)
        __ct__11wxTipDialogFP8wxWindowP13wxTipProviderUl
    ;From object file:  ..\generic\tipwin.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxTipWindow::SetBoundingRect(const wxRect&)
+      SetBoundingRect__11wxTipWindowFRC6wxRect
+      ;wxTipWindowView::OnMouseMove(wxMouseEvent&)
+      OnMouseMove__15wxTipWindowViewFR12wxMouseEvent
+      ;wxTipWindow::OnDismiss()
+      OnDismiss__11wxTipWindowFv
+      ;wxTipWindowView::sm_eventTable
+      sm_eventTable__15wxTipWindowView
+      ;wxTipWindowView::OnMouseClick(wxMouseEvent&)
+      OnMouseClick__15wxTipWindowViewFR12wxMouseEvent
+      __vft11wxTipWindow8wxObject
+      ;wxTipWindowView::GetEventTable() const
+      GetEventTable__15wxTipWindowViewCFv
+      ;wxTipWindow::Close()
+      Close__11wxTipWindowFv
+      ;wxTipWindow::OnMouseClick(wxMouseEvent&)
+      OnMouseClick__11wxTipWindowFR12wxMouseEvent
+      ;wxTipWindow::GetEventTable() const
+      GetEventTable__11wxTipWindowCFv
+      ;wxTipWindow::~wxTipWindow()
+      __dt__11wxTipWindowFv
+      ;wxTipWindow::sm_eventTable
+      sm_eventTable__11wxTipWindow
+      ;wxTipWindow::wxTipWindow(wxWindow*,const wxString&,int,wxTipWindow**,wxRect*)
+      __ct__11wxTipWindowFP8wxWindowRC8wxStringiPP11wxTipWindowP6wxRect
+      __vft15wxTipWindowView8wxObject
+      ;wxTipWindowView::OnPaint(wxPaintEvent&)
+      OnPaint__15wxTipWindowViewFR12wxPaintEvent
+      ;wxTipWindowView::wxTipWindowView(wxWindow*)
+      __ct__15wxTipWindowViewFP8wxWindow
+      ;wxTipWindow::sm_eventTableEntries
+      sm_eventTableEntries__11wxTipWindow
+      ;wxTipWindowView::Adjust(const wxString&,int)
+      Adjust__15wxTipWindowViewFRC8wxStringi
+      ;wxTipWindowView::sm_eventTableEntries
+      sm_eventTableEntries__15wxTipWindowView
    ;From object file:  ..\generic\treectlg.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxTreeRenameTimer::wxTreeRenameTimer(wxGenericTreeCtrl*)
@@ -10495,6 +10713,10 @@ EXPORTS
        LoadFile__20wxHtmlHelpControllerFRC8wxString
    ;From object file:  ..\html\helpdata.cpp
      ;PUBDEFs (Symbols available from object file):
+      ;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)
@@ -10513,12 +10735,10 @@ EXPORTS
        __ct__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
        ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
        WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi
-      ;wxHtmlBookRecArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlBookRecArrayFUi
        ;wxHtmlBookRecArray::DoEmpty()
        DoEmpty__18wxHtmlBookRecArrayFv
-      ;wxHtmlBookRecArray::Add(const wxHtmlBookRecord&)
-      Add__18wxHtmlBookRecArrayFRC16wxHtmlBookRecord
+      ;wxHtmlBookRecArray::Insert(const wxHtmlBookRecord&,unsigned int,unsigned int)
+      Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUiT2
        ;wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord*,wxOutputStream*)
        SaveCachedBook__14wxHtmlHelpDataFP16wxHtmlBookRecordP14wxOutputStream
        ;wxSearchEngine::Scan(wxInputStream*)
@@ -10536,8 +10756,6 @@ EXPORTS
        __vft14wxSearchEngine8wxObject
        ;wxHtmlBookRecArray::DoCopy(const wxHtmlBookRecArray&)
        DoCopy__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
-      ;wxHtmlBookRecArray::Insert(const wxHtmlBookRecord&,unsigned int)
-      Insert__18wxHtmlBookRecArrayFRC16wxHtmlBookRecordUi
        ;wxHtmlBookRecArray::~wxHtmlBookRecArray()
        __dt__18wxHtmlBookRecArrayFv
        wxHtmlHelpIndexCompareFunc
@@ -10591,10 +10809,12 @@ EXPORTS
        WriteCustomization__15wxHtmlHelpFrameFP12wxConfigBaseRC8wxString
        ;wxHtmlHelpFrameOptionsDialog::sm_eventTable
        sm_eventTable__28wxHtmlHelpFrameOptionsDialog
-      ;wxHtmlHelpFrame::OnIndexAll(wxCommandEvent&)
-      OnIndexAll__15wxHtmlHelpFrameFR14wxCommandEvent
+      ;wxHtmlHelpFrame::OnActivate(wxActivateEvent&)
+      OnActivate__15wxHtmlHelpFrameFR15wxActivateEvent
        __vft28wxHtmlHelpFrameOptionsDialog8wxObject
        __vft15wxHtmlHelpFrame8wxObject
+      ;wxHtmlHelpFrame::OnIndexAll(wxCommandEvent&)
+      OnIndexAll__15wxHtmlHelpFrameFR14wxCommandEvent
        ;wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow*,int,const wxString&,int,wxHtmlHelpData*)
        __ct__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2P14wxHtmlHelpData
        ;wxHtmlHelpFrame::DisplayContents()
@@ -10728,6 +10948,8 @@ 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
@@ -10765,8 +10987,6 @@ EXPORTS
        ;wxHtmlTextPieces::Index(const wxHtmlTextPiece&,unsigned long) const
        Index__16wxHtmlTextPiecesCFRC15wxHtmlTextPieceUl
        __vft20wxHtmlEntitiesParser8wxObject
-      ;wxHtmlTextPieces::Insert(const wxHtmlTextPiece&,unsigned int)
-      Insert__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUi
        ;wxHtmlParser::DoParsing()
        DoParsing__12wxHtmlParserFv
        ;wxHtmlParser::RestoreState()
@@ -10777,6 +10997,8 @@ EXPORTS
        __ct__16wxHtmlTextPiecesFRC16wxHtmlTextPieces
        ;wxHtmlParser::SetSource(const wxString&)
        SetSource__12wxHtmlParserFRC8wxString
+      ;wxHtmlTextPieces::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__16wxHtmlTextPiecesFUiT1
        ;wxHtmlTextPieces::DoEmpty()
        DoEmpty__16wxHtmlTextPiecesFv
        ;wxConstructorForwxHtmlEntitiesParser()
@@ -10797,13 +11019,13 @@ EXPORTS
        PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
        ;wxHtmlParser::OpenURL(wxHtmlURLType,const wxString&) const
        OpenURL__12wxHtmlParserCF13wxHtmlURLTypeRC8wxString
-      ;wxHtmlTextPieces::RemoveAt(unsigned int)
-      RemoveAt__16wxHtmlTextPiecesFUi
+      ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
+      CreateDOMSubTree__12wxHtmlParserFP9wxHtmlTagiT2P15wxHtmlTagsCache
        wxHtmlEntityCompare
        ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
        GetCharForCode__20wxHtmlEntitiesParserFUi
-      ;wxHtmlParser::CreateDOMSubTree(wxHtmlTag*,int,int,wxHtmlTagsCache*)
-      CreateDOMSubTree__12wxHtmlParserFP9wxHtmlTagiT2P15wxHtmlTagsCache
+      ;wxHtmlTextPieces::Insert(const wxHtmlTextPiece&,unsigned int,unsigned int)
+      Insert__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUiT2
        ;wxHtmlParser::~wxHtmlParser()
        __dt__12wxHtmlParserFv
        ;wxHtmlTextPieces::operator=(const wxHtmlTextPieces&)
@@ -10813,8 +11035,8 @@ EXPORTS
        __vft12wxHtmlParser8wxObject
        ;wxHtmlParser::DoParsing(int,int)
        DoParsing__12wxHtmlParserFiT1
-      ;wxHtmlTextPieces::Add(const wxHtmlTextPiece&)
-      Add__16wxHtmlTextPiecesFRC15wxHtmlTextPiece
+      ;wxHtmlTextPieces::Add(const wxHtmlTextPiece&,unsigned int)
+      Add__16wxHtmlTextPiecesFRC15wxHtmlTextPieceUi
        ;wxHtmlEntitiesParser::wxHtmlEntitiesParser()
        __ct__20wxHtmlEntitiesParserFv
        ;wxHtmlParser::sm_classwxHtmlParser
@@ -10868,16 +11090,14 @@ EXPORTS
        sm_classwxHtmlWinModule__15wxHtmlWinModule
        ;wxHtmlWindow::SetFonts(wxString,wxString,const int*)
        SetFonts__12wxHtmlWindowF8wxStringT1PCi
-      ;wxHtmlHistoryArray::RemoveAt(unsigned int)
-      RemoveAt__18wxHtmlHistoryArrayFUi
-      ;wxHtmlHistoryArray::Add(const wxHtmlHistoryItem&)
-      Add__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItem
        ;wxHtmlHistoryArray::~wxHtmlHistoryArray()
        __dt__18wxHtmlHistoryArrayFv
        ;wxHtmlWindow::~wxHtmlWindow()
        __dt__12wxHtmlWindowFv
        ;wxHtmlWindow::OnCellMouseHover(wxHtmlCell*,int,int)
        OnCellMouseHover__12wxHtmlWindowFP10wxHtmlCelliT2
+      ;wxHtmlHistoryArray::Insert(const wxHtmlHistoryItem&,unsigned int,unsigned int)
+      Insert__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItemUiT2
        ;wxHtmlWindow::HistoryCanForward()
        HistoryCanForward__12wxHtmlWindowFv
        ;wxHtmlWindow::HistoryBack()
@@ -10896,8 +11116,6 @@ EXPORTS
        OnDraw__12wxHtmlWindowFR4wxDC
        ;wxHtmlHistoryArray::Index(const wxHtmlHistoryItem&,unsigned long) const
        Index__18wxHtmlHistoryArrayCFRC17wxHtmlHistoryItemUl
-      ;wxHtmlHistoryArray::Insert(const wxHtmlHistoryItem&,unsigned int)
-      Insert__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItemUi
        __vft25wxwxHtmlProcessorListNode10wxNodeBase
        ;wxHtmlHistoryArray::DoEmpty()
        DoEmpty__18wxHtmlHistoryArrayFv
@@ -10927,10 +11145,12 @@ EXPORTS
        OnSize__12wxHtmlWindowFR11wxSizeEvent
        ;wxHtmlWindow::OnMouseEvent(wxMouseEvent&)
        OnMouseEvent__12wxHtmlWindowFR12wxMouseEvent
-      ;wxHtmlHistoryArray::operator=(const wxHtmlHistoryArray&)
-      __as__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
+      ;wxHtmlHistoryArray::Add(const wxHtmlHistoryItem&,unsigned int)
+      Add__18wxHtmlHistoryArrayFRC17wxHtmlHistoryItemUi
        ;wxHtmlHistoryArray::wxHtmlHistoryArray(const wxHtmlHistoryArray&)
        __ct__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
+      ;wxHtmlHistoryArray::operator=(const wxHtmlHistoryArray&)
+      __as__18wxHtmlHistoryArrayFRC18wxHtmlHistoryArray
        ;wxHtmlWindow::SetRelatedStatusBar(int)
        SetRelatedStatusBar__12wxHtmlWindowFi
        ;wxHtmlWindow::CleanUpStatics()
@@ -10945,6 +11165,8 @@ EXPORTS
        ReadCustomization__12wxHtmlWindowFP12wxConfigBase8wxString
        ;wxHtmlWindow::OnIdle(wxIdleEvent&)
        OnIdle__12wxHtmlWindowFR11wxIdleEvent
+      ;wxHtmlHistoryArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__18wxHtmlHistoryArrayFUiT1
        ;wxHtmlWindow::Init()
        Init__12wxHtmlWindowFv
        ;wxConstructorForwxHtmlWindow()
@@ -11075,8 +11297,6 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        __vft22wxHtmlImageMapAreaCell8wxObject
        __vft15wxHtmlImageCell8wxObject
-      ;CoordArray::Add(const int&)
-      Add__10CoordArrayFRCi
        ;CoordArray::operator=(const CoordArray&)
        __as__10CoordArrayFRC10CoordArray
        ;CoordArray::~CoordArray()
@@ -11101,6 +11321,8 @@ EXPORTS
        sm_classHTML_ModuleImage__16HTML_ModuleImage
        ;_link_dummy_func_m_image()
        _link_dummy_func_m_image__Fv
+      ;CoordArray::Insert(const int&,unsigned int,unsigned int)
+      Insert__10CoordArrayFRCiUiT2
        ;CoordArray::DoEmpty()
        DoEmpty__10CoordArrayFv
        __vft18wxHtmlImageMapCell8wxObject
@@ -11108,16 +11330,16 @@ EXPORTS
        DoCopy__10CoordArrayFRC10CoordArray
        ;CoordArray::CoordArray(const CoordArray&)
        __ct__10CoordArrayFRC10CoordArray
+      ;CoordArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__10CoordArrayFUiT1
        ;wxHtmlImageCell::Layout(int)
        Layout__15wxHtmlImageCellFi
        ;wxHtmlImageMapCell::GetLink(int,int) const
        GetLink__18wxHtmlImageMapCellCFiT1
+      ;CoordArray::Add(const int&,unsigned int)
+      Add__10CoordArrayFRCiUi
        ;CoordArray::Index(const int&,unsigned long) const
        Index__10CoordArrayCFRCiUl
-      ;CoordArray::RemoveAt(unsigned int)
-      RemoveAt__10CoordArrayFUi
-      ;CoordArray::Insert(const int&,unsigned int)
-      Insert__10CoordArrayFRCiUi
        ;wxHtmlImageCell::GetLink(int,int) const
        GetLink__15wxHtmlImageCellCFiT1
        ;wxHtmlImageCell::~wxHtmlImageCell()
@@ -11283,12 +11505,12 @@ EXPORTS
        wxConstructorForwxAcceleratorTable__Fv
        ;wxAcceleratorTable::SetHACCEL(unsigned long)
        SetHACCEL__18wxAcceleratorTableFUl
-      ;wxAcceleratorTable::wxAcceleratorTable(int,wxAcceleratorEntry*)
-      __ct__18wxAcceleratorTableFiP18wxAcceleratorEntry
        ;wxAcceleratorTable::~wxAcceleratorTable()
        __dt__18wxAcceleratorTableFv
        ;wxAcceleratorTable::Ok() const
        Ok__18wxAcceleratorTableCFv
+      ;wxAcceleratorTable::wxAcceleratorTable(int,const wxAcceleratorEntry*)
+      __ct__18wxAcceleratorTableFiPC18wxAcceleratorEntry
        __vft20wxAcceleratorRefData15wxObjectRefData
        ;wxAcceleratorTable::wxAcceleratorTable()
        __ct__18wxAcceleratorTableFv
@@ -11337,10 +11559,8 @@ EXPORTS
        OnIdle__5wxAppFR11wxIdleEvent
        ;wxMsgArray::wxMsgArray(const wxMsgArray&)
        __ct__10wxMsgArrayFRC10wxMsgArray
-      ;wxMsgArray::Insert(const _QMSG&,unsigned int)
-      Insert__10wxMsgArrayFRC5_QMSGUi
-      ;wxApp::HandleSockets()
-      HandleSockets__5wxAppFv
+      ;wxMsgArray::Insert(const _QMSG&,unsigned int,unsigned int)
+      Insert__10wxMsgArrayFRC5_QMSGUiT2
        wxDEFAULT_MDIPARENTFRAME_ICON
        ;wxApp::wxApp()
        __ct__5wxAppFv
@@ -11350,8 +11570,8 @@ EXPORTS
        ProcessMessage__5wxAppFPPv
        ;wxApp::OnInitGui()
        OnInitGui__5wxAppFv
-      ;wxMsgArray::Add(const _QMSG&)
-      Add__10wxMsgArrayFRC5_QMSG
+      ;wxApp::HandleSockets()
+      HandleSockets__5wxAppFv
        ;wxApp::OnQueryEndSession(wxCloseEvent&)
        OnQueryEndSession__5wxAppFR12wxCloseEvent
        __vft5wxApp8wxObject
@@ -11375,8 +11595,8 @@ EXPORTS
        GetEventTable__5wxAppCFv
        ;wxSetInstance(unsigned long)
        wxSetInstance__FUl
-      ;wxMsgArray::RemoveAt(unsigned int)
-      RemoveAt__10wxMsgArrayFUi
+      ;wxMsgArray::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__10wxMsgArrayFUiT1
        wxGetInstance
        ;wxMsgArray::~wxMsgArray()
        __dt__10wxMsgArrayFv
@@ -11394,6 +11614,8 @@ EXPORTS
        sm_eventTable__5wxApp
        ;wxApp::Initialize(unsigned long)
        Initialize__5wxAppFUl
+      ;wxMsgArray::Add(const _QMSG&,unsigned int)
+      Add__10wxMsgArrayFRC5_QMSGUi
        ;wxAppBase::m_appInitFn
        m_appInitFn__9wxAppBase
        ;wxApp::DoMessage()
@@ -11567,18 +11789,24 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxButton::Command(wxCommandEvent&)
        Command__8wxButtonFR14wxCommandEvent
-      ;wxButton::MakeOwnerDrawn()
-      MakeOwnerDrawn__8wxButtonFv
+      ;wxButton::SetTmpDefault()
+      SetTmpDefault__8wxButtonFv
        ;wxButton::WindowProc(unsigned int,void*,void*)
        WindowProc__8wxButtonFUiPvT2
+      ;wxButton::MakeOwnerDrawn()
+      MakeOwnerDrawn__8wxButtonFv
        ;wxButton::OS2GetStyle(long,unsigned long*) const
        OS2GetStyle__8wxButtonCFlPUl
        ;wxButton::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
        OnCtlColor__8wxButtonFUlT1UiT3PvT5
+      ;wxButton::UnsetTmpDefault()
+      UnsetTmpDefault__8wxButtonFv
        ;wxButton::~wxButton()
        __dt__8wxButtonFv
        ;wxButton::SendClickEvent()
        SendClickEvent__8wxButtonFv
+      ;wxButton::UpdateDefaultStyle(wxWindow*,wxWindow*)
+      UpdateDefaultStyle__8wxButtonFP8wxWindowT1
        ;wxConstructorForwxButton()
        wxConstructorForwxButton__Fv
        ;wxButton::GetDefaultSize()
@@ -11764,10 +11992,10 @@ EXPORTS
      ;PUBDEFs (Symbols available from object file):
        ;wxColour::Set(unsigned char,unsigned char,unsigned char)
        Set__8wxColourFUcN21
-      ;wxColour::wxColour()
-      __ct__8wxColourFv
        ;wxColour::operator=(const wxColour&)
        __as__8wxColourFRC8wxColour
+      ;wxColour::wxColour()
+      __ct__8wxColourFv
        ;wxColour::InitFromName(const wxString&)
        InitFromName__8wxColourFRC8wxString
        ;wxConstructorForwxColour()
@@ -11775,12 +12003,12 @@ EXPORTS
        __vft8wxColour8wxObject
        ;wxColour::wxColour(unsigned char,unsigned char,unsigned char)
        __ct__8wxColourFUcN21
-      ;wxColour::~wxColour()
-      __dt__8wxColourFv
-      ;wxColour::sm_classwxColour
-      sm_classwxColour__8wxColour
        ;wxColour::wxColour(const wxColour&)
        __ct__8wxColourFRC8wxColour
+      ;wxColour::sm_classwxColour
+      sm_classwxColour__8wxColour
+      ;wxColour::~wxColour()
+      __dt__8wxColourFv
    ;From object file:  ..\os2\combobox.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxComboBox::sm_classwxComboBox
@@ -12195,8 +12423,8 @@ EXPORTS
        InitDC__10wxClientDCFv
        ;wxArrayDCInfo::DoCopy(const wxArrayDCInfo&)
        DoCopy__13wxArrayDCInfoFRC13wxArrayDCInfo
-      ;wxArrayDCInfo::Add(const wxPaintDCInfo&)
-      Add__13wxArrayDCInfoFRC13wxPaintDCInfo
+      ;wxArrayDCInfo::Add(const wxPaintDCInfo&,unsigned int)
+      Add__13wxArrayDCInfoFRC13wxPaintDCInfoUi
        ;wxWindowDC::DoGetSize(int*,int*) const
        DoGetSize__10wxWindowDCCFPiT1
        ;wxPaintDC::wxPaintDC()
@@ -12208,8 +12436,8 @@ EXPORTS
        ;wxPaintDC::FindDCInCache(wxWindow*)
        FindDCInCache__9wxPaintDCFP8wxWindow
        __vft10wxWindowDC8wxObject
-      ;wxArrayDCInfo::Insert(const wxPaintDCInfo&,unsigned int)
-      Insert__13wxArrayDCInfoFRC13wxPaintDCInfoUi
+      ;wxArrayDCInfo::RemoveAt(unsigned int,unsigned int)
+      RemoveAt__13wxArrayDCInfoFUiT1
        ;wxConstructorForwxWindowDC()
        wxConstructorForwxWindowDC__Fv
        ;wxPaintDC::~wxPaintDC()
@@ -12220,14 +12448,14 @@ EXPORTS
        __ct__9wxPaintDCFP8wxWindow
        ;wxArrayDCInfo::Index(const wxPaintDCInfo&,unsigned long) const
        Index__13wxArrayDCInfoCFRC13wxPaintDCInfoUl
-      ;wxArrayDCInfo::RemoveAt(unsigned int)
-      RemoveAt__13wxArrayDCInfoFUi
        ;wxPaintDC::FindInCache(unsigned int*) const
        FindInCache__9wxPaintDCCFPUi
        ;wxArrayDCInfo::DoEmpty()
        DoEmpty__13wxArrayDCInfoFv
        ;wxClientDC::~wxClientDC()
        __dt__10wxClientDCFv
+      ;wxArrayDCInfo::Insert(const wxPaintDCInfo&,unsigned int,unsigned int)
+      Insert__13wxArrayDCInfoFRC13wxPaintDCInfoUiT2
        ;wxClientDC::sm_classwxClientDC
        sm_classwxClientDC__10wxClientDC
        ;wxPaintDC::sm_classwxPaintDC
@@ -12262,8 +12490,6 @@ EXPORTS
        DoGetSize__10wxMemoryDCCFPiT1
        ;wxMemoryDC::wxMemoryDC(wxDC*)
        __ct__10wxMemoryDCFP4wxDC
-      ;wxMemoryDC::DoDrawRectangle(int,int,int,int)
-      DoDrawRectangle__10wxMemoryDCFiN31
        ;wxMemoryDC::wxMemoryDC()
        __ct__10wxMemoryDCFv
        ;wxMemoryDC::sm_classwxMemoryDC
@@ -12400,8 +12626,6 @@ EXPORTS
        Revoke__12wxDropTargetFUl
        ;wxDropTarget::Register(unsigned long)
        Register__12wxDropTargetFUl
-      ;wxDropSource::DoDragDrop(unsigned long)
-      DoDragDrop__12wxDropSourceFUl
        ;wxDropTarget::OnDrop(int,int)
        OnDrop__12wxDropTargetFiT1
        ;wxDropTarget::GetData()
@@ -12414,6 +12638,8 @@ EXPORTS
        OnDragOver__12wxDropTargetFiT112wxDragResult
        ;wxDropTarget::~wxDropTarget()
        __dt__12wxDropTargetFv
+      ;wxDropSource::DoDragDrop(int)
+      DoDragDrop__12wxDropSourceFi
        ;wxDropSource::Init()
        Init__12wxDropSourceFv
        ;wxDropTarget::IsAcceptable(_DRAGINFO*)
@@ -12550,16 +12776,16 @@ EXPORTS
        ;wxConstructorForwxFontDialog()
        wxConstructorForwxFontDialog__Fv
        __vft12wxFontDialog8wxObject
-      ;wxFontDialog::wxFontDialog(wxWindow*,wxFontData*)
-      __ct__12wxFontDialogFP8wxWindowP10wxFontData
+      ;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
        sm_classwxFontDialog__12wxFontDialog
-      ;wxFontDialog::Create(wxWindow*,wxFontData*)
-      Create__12wxFontDialogFP8wxWindowP10wxFontData
    ;From object file:  ..\os2\fontenum.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxFontEnumerator::EnumerateFacenames(wxFontEncoding,unsigned long)
@@ -13246,10 +13472,12 @@ EXPORTS
        OS2Command__6wxMenuFUiUs
        ;wxMenuBar::EnableTop(unsigned int,unsigned long)
        EnableTop__9wxMenuBarFUiUl
-      ;wxMenu::DoAppend(wxMenuItem*)
-      DoAppend__6wxMenuFP10wxMenuItem
+      ;wxMenu::Attach(wxMenuBarBase*)
+      Attach__6wxMenuFP13wxMenuBarBase
        ;wxMenu::DoRemove(wxMenuItem*)
        DoRemove__6wxMenuFP10wxMenuItem
+      ;wxMenu::DoAppend(wxMenuItem*)
+      DoAppend__6wxMenuFP10wxMenuItem
        ;wxMenu::CopyAccels(wxAcceleratorEntry*) const
        CopyAccels__6wxMenuCFP18wxAcceleratorEntry
        ;wxMenuBar::Refresh()
@@ -13632,6 +13860,21 @@ EXPORTS
        GetBitmap__11wxPNGReaderFv
        ;wxPNGReader::CreateMask()
        CreateMask__11wxPNGReaderFv
+  ;From object file:  ..\os2\popupwin.cpp
+    ;PUBDEFs (Symbols available from object file):
+      __vft13wxPopupWindow8wxObject
+      ;wxPopupWindow::DoGetPosition(int*,int*) const
+      DoGetPosition__13wxPopupWindowCFPiT1
+      ;wxPopupWindow::FindPopupFor(wxWindow*)
+      FindPopupFor__13wxPopupWindowFP8wxWindow
+      ;wxPopupWindow::Show(unsigned long)
+      Show__13wxPopupWindowFUl
+      ;wxPopupWindow::m_svShownPopups
+      m_svShownPopups__13wxPopupWindow
+      ;wxPopupWindow::OS2GetStyle(long,unsigned long*) const
+      OS2GetStyle__13wxPopupWindowCFlPUl
+      ;wxPopupWindow::Create(wxWindow*,int)
+      Create__13wxPopupWindowFP8wxWindowi
    ;From object file:  ..\os2\print.cpp
      ;PUBDEFs (Symbols available from object file):
        ;wxPrintPreview::Print(unsigned long)
@@ -13918,6 +14161,8 @@ EXPORTS
        GetPosition__8wxSliderCFPiT1
        ;wxSlider::OnCtlColor(unsigned long,unsigned long,unsigned int,unsigned int,void*,void*)
        OnCtlColor__8wxSliderFUlT1UiT3PvT5
+      ;wxSlider::DoGetSize(int*,int*) const
+      DoGetSize__8wxSliderCFPiT1
        ;wxConstructorForwxSlider()
        wxConstructorForwxSlider__Fv
        ;wxSlider::wxSlider()
@@ -14595,12 +14840,16 @@ EXPORTS
        Init__19wxTopLevelWindowOS2Fv
        ;wxTopLevelWindowOS2::m_sbInitialized
        m_sbInitialized__19wxTopLevelWindowOS2
+      ;wxTopLevelWindowOS2::OS2GetParent() const
+      OS2GetParent__19wxTopLevelWindowOS2CFv
        ;wxTopLevelWindowOS2::Iconize(unsigned long)
        Iconize__19wxTopLevelWindowOS2FUl
        ;wxTopLevelWindowOS2::DoSetClientSize(int,int)
        DoSetClientSize__19wxTopLevelWindowOS2FiT1
        ;wxTopLevelWindowOS2::IsMaximized() const
        IsMaximized__19wxTopLevelWindowOS2CFv
+      ;wxTopLevelWindowOS2::m_spHiddenParent
+      m_spHiddenParent__19wxTopLevelWindowOS2
        ;wxTopLevelWindowOS2::SetIcon(const wxIcon&)
        SetIcon__19wxTopLevelWindowOS2FRC6wxIcon
        ;wxTopLevelWindowOS2::Restore()
@@ -14652,6 +14901,8 @@ EXPORTS
        wxGetMousePosition__FPiT1
        ;wxDrawBorder(unsigned long,_RECTL&,unsigned long)
        wxDrawBorder__FUlR6_RECTLT1
+      ;wxShutdown(wxShutdownFlags)
+      wxShutdown__F15wxShutdownFlags
        ;wxPathExists(const wxString&)
        wxPathExists__FRC8wxString
        ;wxGetWindowText(unsigned long)
@@ -14753,20 +15004,26 @@ EXPORTS
        HandleEraseBkgnd__8wxWindowFUl
        ;wxWindow::HandleCreate(void*,unsigned long*)
        HandleCreate__8wxWindowFPvPUl
+      ;wxWindow::HandleChar(void*,void*,unsigned long)
+      HandleChar__8wxWindowFPvT1Ul
        ;wxWindow::DoGetPosition(int*,int*) const
        DoGetPosition__8wxWindowCFPiT1
        ;wxCharCodeOS2ToWX(int)
        wxCharCodeOS2ToWX__Fi
        ;wxWindow::HandleMouseMove(int,int,unsigned int)
        HandleMouseMove__8wxWindowFiT1Ui
-      ;wxWindow::Raise()
-      Raise__8wxWindowFv
+      ;wxWindow::SetFocusFromKbd()
+      SetFocusFromKbd__8wxWindowFv
        ;wxWindowCreationHook::~wxWindowCreationHook()
        __dt__20wxWindowCreationHookFv
        ;wxWindow::Update()
        Update__8wxWindowFv
        ;wxWindow::UnsubclassWin()
        UnsubclassWin__8wxWindowFv
+      ;wxWindow::Raise()
+      Raise__8wxWindowFv
+      ;wxWindow::OS2GetParent() const
+      OS2GetParent__8wxWindowCFv
        ;wxWindow::Lower()
        Lower__8wxWindowFv
        ;wxWindow::HandleMaximize()
@@ -14879,6 +15136,8 @@ EXPORTS
        GetEventTable__8wxWindowCFv
        ;wxWindow::GetClientAreaOrigin() const
        GetClientAreaOrigin__8wxWindowCFv
+      ;FindWindowForMouseEvent(wxWindow*,short*,short*)
+      FindWindowForMouseEvent__FP8wxWindowPsT2
        ;wxWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
        Create__8wxWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
        ;wxAssociateWinWithHandle(unsigned long,wxWindow*)
@@ -14977,8 +15236,6 @@ EXPORTS
        FindItemByHWND__8wxWindowCFUlT1
        ;wxWindow::HandleKeyUp(void*,void*)
        HandleKeyUp__8wxWindowFPvT1
-      ;wxWindow::HandleChar(unsigned long,void*,unsigned long)
-      HandleChar__8wxWindowFUlPvT1
        ;wxWindow::DoMoveWindow(int,int,int,int)
        DoMoveWindow__8wxWindowFiN31
        ;wxWindow::DoClientToScreen(int*,int*) const