Better placement of the AutoComplete listbox

[wxWidgets.git] / src / os2 / wx23.def

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 92f700571afa14b471598a8f896890561d086197..67a5e1ad80274539f02f369d37dfe4fdfb38de04 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
 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
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar


@@ -68,6 +68,8 @@ EXPORTS
       OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
       ;wxTrap()
       wxTrap__Fv
       OnCmdLineHelp__9wxAppBaseFR15wxCmdLineParser
       ;wxTrap()
       wxTrap__Fv

+      ;wxAppBase::OnRun()
+      OnRun__9wxAppBaseFv

       ;wxAppBase::OnExit()
       OnExit__9wxAppBaseFv
       ;wxAssertIsEqual(int,int)
       ;wxAppBase::OnExit()
       OnExit__9wxAppBaseFv
       ;wxAssertIsEqual(int,int)


@@ -78,6 +80,8 @@ EXPORTS
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv
       __ct__9wxAppBaseFv
       ;wxAppBase::OnInit()
       OnInit__9wxAppBaseFv

+      ;wxAppBase::CreateMessageOutput()
+      CreateMessageOutput__9wxAppBaseFv

       ;wxOnAssert(const char*,int,const char*,const char*)
       wxOnAssert__FPCciN21
       ;wxAppBase::~wxAppBase()
       ;wxOnAssert(const char*,int,const char*,const char*)
       wxOnAssert__FPCciN21
       ;wxAppBase::~wxAppBase()


@@ -86,6 +90,8 @@ EXPORTS
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
       OnCmdLineError__9wxAppBaseFR15wxCmdLineParser
       ProcessPendingEvents__9wxAppBaseFv
       ;wxAppBase::OnCmdLineError(wxCmdLineParser&)
       OnCmdLineError__9wxAppBaseFR15wxCmdLineParser

+      ;wxAppBase::CreateLogTarget()
+      CreateLogTarget__9wxAppBaseFv

       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
   ;From object file:  ..\common\choiccmn.cpp
       ;wxAppBase::SetActive(unsigned long,wxWindow*)
       SetActive__9wxAppBaseFUlP8wxWindow
   ;From object file:  ..\common\choiccmn.cpp


@@ -159,6 +165,8 @@ EXPORTS
       Insert__14wxArrayOptionsFRC15wxCmdLineOptionUiT2
       ;wxCmdLineParserData::wxCmdLineParserData()
       __ct__19wxCmdLineParserDataFv
       Insert__14wxArrayOptionsFRC15wxCmdLineOptionUiT2
       ;wxCmdLineParserData::wxCmdLineParserData()
       __ct__19wxCmdLineParserDataFv

+      ;wxCmdLineParser::AreLongOptionsEnabled()
+      AreLongOptionsEnabled__15wxCmdLineParserFv

       ;wxCmdLineParser::SetCmdLine(const wxString&)
       SetCmdLine__15wxCmdLineParserFRC8wxString
       ;wxArrayParams::wxArrayParams(const wxArrayParams&)
       ;wxCmdLineParser::SetCmdLine(const wxString&)
       SetCmdLine__15wxCmdLineParserFRC8wxString
       ;wxArrayParams::wxArrayParams(const wxArrayParams&)


@@ -199,6 +207,8 @@ EXPORTS
       __dt__15wxCmdLineParserFv
       ;wxArrayParams::~wxArrayParams()
       __dt__13wxArrayParamsFv
       __dt__15wxCmdLineParserFv
       ;wxArrayParams::~wxArrayParams()
       __dt__13wxArrayParamsFv

+      ;wxCmdLineParser::GetUsageString()
+      GetUsageString__15wxCmdLineParserFv

       ;wxArrayParams::operator=(const wxArrayParams&)
       __as__13wxArrayParamsFRC13wxArrayParams
       ;wxArrayOptions::RemoveAt(unsigned int,unsigned int)
       ;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
       sm_classwxFontData__10wxFontData
       ;wxPageSetupDialogData::SetPaperSize(wxPaperSize)
       SetPaperSize__21wxPageSetupDialogDataF11wxPaperSize

-      ;wxFontData::~wxFontData()
-      __dt__10wxFontDataFv

       ;wxConstructorForwxColourData()
       wxConstructorForwxColourData__Fv
       ;wxColourData::~wxColourData()
       __dt__12wxColourDataFv
       ;wxConstructorForwxColourData()
       wxConstructorForwxColourData__Fv
       ;wxColourData::~wxColourData()
       __dt__12wxColourDataFv

+      ;wxFontData::~wxFontData()
+      __dt__10wxFontDataFv

       ;wxPrintData::wxPrintData(const wxPrintData&)
       __ct__11wxPrintDataFRC11wxPrintData
       ;wxPrintDialogData::sm_classwxPrintDialogData
       ;wxPrintData::wxPrintData(const wxPrintData&)
       __ct__11wxPrintDataFRC11wxPrintData
       ;wxPrintDialogData::sm_classwxPrintDialogData


@@ -295,8 +305,6 @@ EXPORTS
       __ct__21wxPageSetupDialogDataFRC21wxPageSetupDialogData
       ;wxColourData::wxColourData(const wxColourData&)
       __ct__12wxColourDataFRC12wxColourData
       __ct__21wxPageSetupDialogDataFRC21wxPageSetupDialogData
       ;wxColourData::wxColourData(const wxColourData&)
       __ct__12wxColourDataFRC12wxColourData

-      ;wxPrintData::operator=(const wxPrintSetupData&)
-      __as__11wxPrintDataFRC16wxPrintSetupData

       ;wxPrintData::~wxPrintData()
       __dt__11wxPrintDataFv
       ;wxConstructorForwxPrintDialogData()
       ;wxPrintData::~wxPrintData()
       __dt__11wxPrintDataFv
       ;wxConstructorForwxPrintDialogData()


@@ -1153,6 +1161,8 @@ EXPORTS
       OnNewDocument__10wxDocumentFv
       ;wxView::OnCreatePrintout()
       OnCreatePrintout__6wxViewFv
       OnNewDocument__10wxDocumentFv
       ;wxView::OnCreatePrintout()
       OnCreatePrintout__6wxViewFv

+      ;wxDocument::NotifyClosing()
+      NotifyClosing__10wxDocumentFv

       ;wxDocManager::GetNoHistoryFiles() const
       GetNoHistoryFiles__12wxDocManagerCFv
       ;wxFileHistory::AddFilesToMenu()
       ;wxDocManager::GetNoHistoryFiles() const
       GetNoHistoryFiles__12wxDocManagerCFv
       ;wxFileHistory::AddFilesToMenu()


@@ -1597,14 +1607,20 @@ EXPORTS
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
       CompareCharsetItems
       ;wxEncodingConverter::wxEncodingConverter()
       __ct__19wxEncodingConverterFv
       CompareCharsetItems

+      ;wxEncodingConverter::Convert(const char*,wchar_t*)
+      Convert__19wxEncodingConverterFPCcPw

       ;wxEncodingConverter::Init(wxFontEncoding,wxFontEncoding,int)
       Init__19wxEncodingConverterF14wxFontEncodingT1i
       ;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 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
   ;From object file:  ..\common\event.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSetCursorEvent::sm_classwxSetCursorEvent


@@ -1805,6 +1821,7 @@ EXPORTS
       ;wxMouseEvent::Assign(const wxMouseEvent&)
       Assign__12wxMouseEventFRC12wxMouseEvent
       wxEVT_SCROLL_LINEUP
       ;wxMouseEvent::Assign(const wxMouseEvent&)
       Assign__12wxMouseEventFRC12wxMouseEvent
       wxEVT_SCROLL_LINEUP

+      wxEVT_SCROLL_ENDSCROLL

       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_NC_RIGHT_UP
       wxEVT_PAINT
       wxEVT_NULL
       wxEVT_NC_RIGHT_UP


@@ -3461,14 +3478,14 @@ EXPORTS
       sm_classwxLocaleModule__14wxLocaleModule
       ;wxLanguageInfoArray::RemoveAt(unsigned int,unsigned int)
       RemoveAt__19wxLanguageInfoArrayFUiT1
       sm_classwxLocaleModule__14wxLocaleModule
       ;wxLanguageInfoArray::RemoveAt(unsigned int,unsigned int)
       RemoveAt__19wxLanguageInfoArrayFUiT1

-      ;wxLocale::GetSystemEncoding()
-      GetSystemEncoding__8wxLocaleFv
+      ;wxLocale::CreateLanguagesDB()
+      CreateLanguagesDB__8wxLocaleFv

       ;wxLocale::~wxLocale()
       __dt__8wxLocaleFv
       ;wxLocale::GetSystemLanguage()
       GetSystemLanguage__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&)
       ;wxLanguageInfoArray::Index(const wxLanguageInfo&,unsigned long) const
       Index__19wxLanguageInfoArrayCFRC14wxLanguageInfoUl
       ;wxLanguageInfoArray::wxLanguageInfoArray(const wxLanguageInfoArray&)


@@ -4293,6 +4310,8 @@ EXPORTS
       ClearData__18wxMimeTypesManagerFv
       ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
       __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
       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
       ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
       GetOpenCommand__10wxFileTypeCFP8wxStringRCQ2_10wxFileType17MessageParameters
       ;wxFileType::GetMimeType(wxString*) const


@@ -4320,6 +4339,23 @@ EXPORTS
       CleanUpModules__8wxModuleFv
       ;wxModule::RegisterModule(wxModule*)
       RegisterModule__8wxModuleFP8wxModule
       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
   ;From object file:  ..\common\mstream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxMemoryOutputStream::CopyTo(void*,unsigned int) const


@@ -4403,6 +4439,8 @@ EXPORTS
       FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject
       FindClass__11wxClassInfoFPCc
       ;wxObject::sm_classwxObject
       sm_classwxObject__8wxObject

+      ;wxClassInfo::~wxClassInfo()
+      __dt__11wxClassInfoFv

       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
   ;From object file:  ..\common\odbc.cpp
       ;wxClassInfo::InitializeClasses()
       InitializeClasses__11wxClassInfoFv
   ;From object file:  ..\common\odbc.cpp


@@ -4553,10 +4591,12 @@ EXPORTS
       SetZoom__18wxPrintPreviewBaseFi
       ;wxPrintout::GetPageInfo(int*,int*,int*,int*)
       GetPageInfo__10wxPrintoutFPiN31
       SetZoom__18wxPrintPreviewBaseFi
       ;wxPrintout::GetPageInfo(int*,int*,int*,int*)
       GetPageInfo__10wxPrintoutFPiN31

-      ;wxPrinterBase::~wxPrinterBase()
-      __dt__13wxPrinterBaseFv
+      ;wxPreviewControlBar::OnFirst()
+      OnFirst__19wxPreviewControlBarFv

       ;wxPreviewControlBar::sm_eventTable
       sm_eventTable__19wxPreviewControlBar
       ;wxPreviewControlBar::sm_eventTable
       sm_eventTable__19wxPreviewControlBar

+      ;wxPrinterBase::~wxPrinterBase()
+      __dt__13wxPrinterBaseFv

       ;wxPreviewFrame::CreateCanvas()
       CreateCanvas__14wxPreviewFrameFv
       ;wxPreviewControlBar::CreateButtons()
       ;wxPreviewFrame::CreateCanvas()
       CreateCanvas__14wxPreviewFrameFv
       ;wxPreviewControlBar::CreateButtons()


@@ -4587,6 +4627,8 @@ EXPORTS
       OnBeginDocument__10wxPrintoutFiT1
       ;wxPrintPreviewBase::Init(wxPrintout*,wxPrintout*)
       Init__18wxPrintPreviewBaseFP10wxPrintoutT1
       OnBeginDocument__10wxPrintoutFiT1
       ;wxPrintPreviewBase::Init(wxPrintout*,wxPrintout*)
       Init__18wxPrintPreviewBaseFP10wxPrintoutT1

+      ;wxPreviewControlBar::OnGoto()
+      OnGoto__19wxPreviewControlBarFv

       ;wxPrintout::~wxPrintout()
       __dt__10wxPrintoutFv
       ;wxPrintout::OnEndDocument()
       ;wxPrintout::~wxPrintout()
       __dt__10wxPrintoutFv
       ;wxPrintout::OnEndDocument()


@@ -4644,6 +4686,8 @@ EXPORTS
       __dt__14wxPreviewFrameFv
       ;wxPreviewControlBar::OnPrevious()
       OnPrevious__19wxPreviewControlBarFv
       __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&)
       ;wxPreviewControlBar::GetEventTable() const
       GetEventTable__19wxPreviewControlBarCFv
       ;wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase*,wxFrame*,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)


@@ -4658,14 +4702,20 @@ EXPORTS
       Exists__9wxProcessFi
       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv
       Exists__9wxProcessFi
       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv

-      ;wxProcess::Init(wxEvtHandler*,int,unsigned long)
-      Init__9wxProcessFP12wxEvtHandleriUl
-      __vft9wxProcess8wxObject

       ;wxProcess::Kill(int,wxSignal)
       Kill__9wxProcessFi8wxSignal
       ;wxProcess::Kill(int,wxSignal)
       Kill__9wxProcessFi8wxSignal

+      __vft9wxProcess8wxObject
+      ;wxProcess::Open(const wxString&,int)
+      Open__9wxProcessFRC8wxStringi
+      ;wxProcess::IsErrorAvailable() const
+      IsErrorAvailable__9wxProcessCFv

       wxEVT_END_PROCESS
       wxEVT_END_PROCESS

+      ;wxProcess::Init(wxEvtHandler*,int,int)
+      Init__9wxProcessFP12wxEvtHandleriT2

       ;wxProcess::~wxProcess()
       __dt__9wxProcessFv
       ;wxProcess::~wxProcess()
       __dt__9wxProcessFv

+      ;wxProcess::IsInputOpened() const
+      IsInputOpened__9wxProcessCFv

       ;wxConstructorForwxProcessEvent()
       wxConstructorForwxProcessEvent__Fv
       ;wxProcess::sm_classwxProcess
       ;wxConstructorForwxProcessEvent()
       wxConstructorForwxProcessEvent__Fv
       ;wxProcess::sm_classwxProcess


@@ -4676,6 +4726,8 @@ EXPORTS
       OnTerminate__9wxProcessFiT1
       ;wxProcess::Detach()
       Detach__9wxProcessFv
       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()
   ;From object file:  ..\common\protocol.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxProtocol::wxProtocol()


@@ -5168,10 +5220,12 @@ EXPORTS
       Add__7wxSizerFP7wxSizeriN22P8wxObject
       ;wxSizer::Prepend(int,int,int,int,int,wxObject*)
       Prepend__7wxSizerFiN41P8wxObject
       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
       ;wxBoxSizer::wxBoxSizer(int)
       __ct__10wxBoxSizerFi

+      ;wxFlexGridSizer::AddGrowableCol(unsigned int)
+      AddGrowableCol__15wxFlexGridSizerFUi

       ;wxSizerItem::IsSizer()
       IsSizer__11wxSizerItemFv
       ;wxNotebookSizer::sm_classwxNotebookSizer
       ;wxSizerItem::IsSizer()
       IsSizer__11wxSizerItemFv
       ;wxNotebookSizer::sm_classwxNotebookSizer


@@ -5374,13 +5428,53 @@ EXPORTS
       __vft18wxwxListStringNode10wxNodeBase
   ;From object file:  ..\common\strconv.cpp
     ;PUBDEFs (Symbols available from object file):
       __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

       ;wxStrConvModule::sm_classwxStrConvModule
       sm_classwxStrConvModule__15wxStrConvModule
       ;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
+      __vft12wxMBConvUTF88wxMBConv

       wxConvCurrent
       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
       wxConvLibc

+      ;wxMBConv::MB2WC(wchar_t*,const char*,unsigned int) const
+      MB2WC__8wxMBConvCFPwPCcUi

       ;wxConstructorForwxStrConvModule()
       wxConstructorForwxStrConvModule__Fv
       ;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)
   ;From object file:  ..\common\stream.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxStreamBuffer::SetBufferIO(void*,unsigned int,unsigned long)


@@ -5586,6 +5680,8 @@ EXPORTS
       find_first_of__8wxStringCFPCcUi
       ;operator+(const wxString&,const wxString&)
       __pl__FRC8wxStringT1
       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&))
       ;wxString::wxString(const void*,const void*)
       __ct__8wxStringFPCvT1
       ;wxArrayString::Sort(int(*)(const wxString&,const wxString&))


@@ -5658,8 +5754,6 @@ EXPORTS
       AfterLast__8wxStringCFc
       ;wxString::find(char,unsigned int) const
       find__8wxStringCFcUi
       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)
       ;wxString::rfind(const wxString&,unsigned int) const
       rfind__8wxStringCFRC8wxStringUi
       ;wxString::replace(unsigned int,unsigned int,const char*,unsigned int)


@@ -5701,6 +5795,8 @@ EXPORTS
       __pl__FRC8wxStringPCc
       ;wxArrayString::operator==(const wxArrayString&) const
       __eq__13wxArrayStringCFRC13wxArrayString
       __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*)
       ;wxString::StartsWith(const char*,wxString*) const
       StartsWith__8wxStringCFPCcP8wxString
       ;wxArrayString::Remove(const char*)


@@ -5739,8 +5835,6 @@ EXPORTS
       ToDouble__8wxStringCFPd
       ;wxString::wxString(char,unsigned int)
       __ct__8wxStringFcUi
       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
       ;wxString::ToULong(unsigned long*,int) const
       ToULong__8wxStringCFPUli
       ;wxString::Right(unsigned int) const


@@ -6037,6 +6131,8 @@ EXPORTS
       __dt__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent
       __dt__20wxTopLevelWindowBaseFv
       ;wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__20wxTopLevelWindowBaseFR12wxCloseEvent

+      ;wxTopLevelWindowBase::IsLastBeforeExit() const
+      IsLastBeforeExit__20wxTopLevelWindowBaseCFv

       ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()
       ;wxTopLevelWindowBase::DoScreenToClient(int*,int*) const
       DoScreenToClient__20wxTopLevelWindowBaseCFPiT1
       ;wxTopLevelWindowBase::Destroy()


@@ -6616,6 +6712,8 @@ EXPORTS
       sm_classwxVariantDataChar__17wxVariantDataChar
       ;wxVariant::operator==(void*) const
       __eq__9wxVariantCFPv
       sm_classwxVariantDataChar__17wxVariantDataChar
       ;wxVariant::operator==(void*) const
       __eq__9wxVariantCFPv

+      ;wxVariant::NullList()
+      NullList__9wxVariantFv

       ;wxVariant::GetList() const
       GetList__9wxVariantCFv
       ;wxVariant::GetCount() const
       ;wxVariant::GetList() const
       GetList__9wxVariantCFv
       ;wxVariant::GetCount() const


@@ -7108,10 +7206,17 @@ EXPORTS
       wxGetTopLevelParent__FP8wxWindow
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):
       wxGetTopLevelParent__FP8wxWindow
   ;From object file:  ..\common\wxchar.cpp
     ;PUBDEFs (Symbols available from object file):

+      ;wxVsnprintf_(char*,unsigned int,const char*,char*)
+      wxVsnprintf___FPcUiPCcT1
+      wcslen
+      ;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
       ;wxOKlibc()
       wxOKlibc__Fv

-      ;wcslen(const wchar_t*)
-      wcslen__FPCw

   ;From object file:  ..\common\wxexpr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExpr::GetAttributeValue(const wxString&,long&) const
   ;From object file:  ..\common\wxexpr.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxExpr::GetAttributeValue(const wxString&,long&) const


@@ -7621,41 +7726,20 @@ EXPORTS
       __dt__17wxBufferedPaintDCFv
   ;From object file:  ..\generic\dcpsg.cpp
     ;PUBDEFs (Symbols available from object file):
       __dt__17wxBufferedPaintDCFv
   ;From object file:  ..\generic\dcpsg.cpp
     ;PUBDEFs (Symbols available from object file):

-      __vft23wxPostScriptPrintDialog8wxObject

       ;wxPostScriptDC::wxPostScriptDC(const wxPrintData&)
       __ct__14wxPostScriptDCFRC11wxPrintData
       ;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
       ;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
       ;wxPostScriptDC::StartPage()
       StartPage__14wxPostScriptDCFv

-      ;wxPostScriptModule::OnInit()
-      OnInit__18wxPostScriptModuleFv

       ;wxPostScriptDC::GetCharHeight() const
       GetCharHeight__14wxPostScriptDCCFv
       ;wxPostScriptDC::EndPage()
       EndPage__14wxPostScriptDCFv
       ;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
       ;wxPostScriptDC::DoDrawRotatedText(const wxString&,int,int,double)
       DoDrawRotatedText__14wxPostScriptDCFRC8wxStringiT2d
       __vft14wxPostScriptDC8wxObject


@@ -7665,17 +7749,6 @@ EXPORTS
       DoDrawSpline__14wxPostScriptDCFP6wxList
       ;wxPostScriptDC::DoSetClippingRegion(int,int,int,int)
       DoSetClippingRegion__14wxPostScriptDCFiN31
       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
       ;wxPostScriptDC::SetLogicalFunction(int)
       SetLogicalFunction__14wxPostScriptDCFi
       ;wxPostScriptDC::DoGetSizeMM(int*,int*) const


@@ -7686,21 +7759,10 @@ EXPORTS
       DoDrawLine__14wxPostScriptDCFiN31
       ;wxPostScriptDC::DoGetPixel(int,int,wxColour*) const
       DoGetPixel__14wxPostScriptDCCFiT1P8wxColour
       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
       ;wxPostScriptDC::DoDrawRoundedRectangle(int,int,int,int,double)
       DoDrawRoundedRectangle__14wxPostScriptDCFiN31d

-      ;wxInitializePrintSetupData(unsigned long)
-      wxInitializePrintSetupData__FUl
-      __vft18wxPostScriptModule8wxObject

       ;wxPostScriptDC::SetResolution(int)
       SetResolution__14wxPostScriptDCFi
       ;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)
       ;wxPostScriptDC::SetDeviceOrigin(int,int)
       SetDeviceOrigin__14wxPostScriptDCFiT1
       ;wxPostScriptDC::SetAxisOrientation(unsigned long,unsigned long)


@@ -7711,20 +7773,12 @@ EXPORTS
       DoDrawPolygon__14wxPostScriptDCFiP7wxPointN31
       ;wxPostScriptDC::DoDrawEllipticArc(int,int,int,int,double,double)
       DoDrawEllipticArc__14wxPostScriptDCFiN31dT5
       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
       ;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&)
       ;wxPostScriptDC::DoDrawBitmap(const wxBitmap&,int,int,unsigned long)
       DoDrawBitmap__14wxPostScriptDCFRC8wxBitmapiT2Ul
       ;wxPostScriptDC::SetBackground(const wxBrush&)


@@ -7737,14 +7791,6 @@ EXPORTS
       DoBlit__14wxPostScriptDCFiN31P4wxDCN31UlN21
       ;wxPostScriptDC::~wxPostScriptDC()
       __dt__14wxPostScriptDCFv
       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
       ;wxPostScriptDC::Ok() const
       Ok__14wxPostScriptDCCFv
       ;wxPostScriptDC::GetPPI() const


@@ -7757,31 +7803,16 @@ EXPORTS
       Clear__14wxPostScriptDCFv
       ;wxPostScriptDC::StartDoc(const wxString&)
       StartDoc__14wxPostScriptDCFRC8wxString
       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
       ;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
       ;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
       ;wxPostScriptDC::DoDrawIcon(const wxIcon&,int,int)
       DoDrawIcon__14wxPostScriptDCFRC6wxIconiT2

-      ;wxGetPrinterOrientation()
-      wxGetPrinterOrientation__Fv
-      ;wxPrintSetupData::wxPrintSetupData()
-      __ct__16wxPrintSetupDataFv

       ;wxPostScriptDC::SetPen(const wxPen&)
       SetPen__14wxPostScriptDCFRC5wxPen
       ;wxPostScriptDC::GetCharWidth() const
       ;wxPostScriptDC::SetPen(const wxPen&)
       SetPen__14wxPostScriptDCFRC5wxPen
       ;wxPostScriptDC::GetCharWidth() const


@@ -9001,39 +9032,43 @@ EXPORTS
       KeywordSearch__24wxHTMLHelpControllerBaseFRC8wxString
   ;From object file:  ..\generic\imaglist.cpp
     ;PUBDEFs (Symbols available from object file):
       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::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
       ;wxConstructorForwxImageList()
       wxConstructorForwxImageList__Fv

-      ;wxImageList::RemoveAll()
-      RemoveAll__11wxImageListFv

   ;From object file:  ..\generic\laywin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent&)
   ;From object file:  ..\generic\laywin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent&)


@@ -9076,24 +9111,20 @@ EXPORTS
       wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTable
       sm_eventTable__14wxListTextCtrl
       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
       ;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
       ;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)
       ;wxListMainWindow::HighlightAll(unsigned long)
       HighlightAll__16wxListMainWindowFUl
       ;wxListMainWindow::DeleteItem(long)


@@ -9104,8 +9135,14 @@ EXPORTS
       __ct__14wxListTextCtrlFP16wxListMainWindowUi
       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1
       __ct__14wxListTextCtrlFP16wxListMainWindowUi
       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1

+      ;wxGenericListCtrl::SetItem(wxListItem&)
+      SetItem__17wxGenericListCtrlFR10wxListItem

       ;wxListLineData::SetItem(int,const wxListItem&)
       SetItem__14wxListLineDataFiRC10wxListItem
       ;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)
       ;wxListMainWindow::RefreshLine(unsigned int)
       RefreshLine__16wxListMainWindowFUi
       ;wxSelectionStore::OnItemDelete(unsigned int)


@@ -9118,8 +9155,6 @@ EXPORTS
       GetLineLabelRect__16wxListMainWindowCFUi
       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem
       GetLineLabelRect__16wxListMainWindowCFUi
       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem

-      ;wxListCtrl::FindItem(long,long)
-      FindItem__10wxListCtrlFlT1

       ;wxListItemData::Init()
       Init__14wxListItemDataFv
       ;wxListHeaderWindow::~wxListHeaderWindow()
       ;wxListItemData::Init()
       Init__14wxListItemDataFv
       ;wxListHeaderWindow::~wxListHeaderWindow()


@@ -9128,10 +9163,12 @@ EXPORTS
       __ct__16wxListMainWindowFv
       ;wxListHeaderData::wxListHeaderData()
       __ct__16wxListHeaderDataFv
       __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
       ;wxListRenameTimer::Notify()
       ;wxListLineData::ReverseHighlight()
       ReverseHighlight__14wxListLineDataFv
       ;wxListRenameTimer::Notify()


@@ -9140,76 +9177,94 @@ EXPORTS
       Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
       Init__18wxListHeaderWindowFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv

-      ;wxListCtrl::GetTopItem() const
-      GetTopItem__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetTopItem() const
+      GetTopItem__17wxGenericListCtrlCFv

       ;wxListMainWindow::GetNextItem(long,int,int) const
       GetNextItem__16wxListMainWindowCFliT2
       ;wxListMainWindow::GetNextItem(long,int,int) const
       GetNextItem__16wxListMainWindowCFliT2

-      ;wxListCtrl::GetItemCount() const
-      GetItemCount__10wxListCtrlCFv

       ;wxListMainWindow::GetImageSize(int,int&,int&) const
       GetImageSize__16wxListMainWindowCFiRiT2
       ;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
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32

+      ;wxGenericListCtrl::ClearAll()
+      ClearAll__17wxGenericListCtrlFv

       ;wxListMainWindow::OnRenameAccept(unsigned int,const wxString&)
       OnRenameAccept__16wxListMainWindowFUiRC8wxString
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
       ;wxListMainWindow::OnRenameAccept(unsigned int,const wxString&)
       OnRenameAccept__16wxListMainWindowFUiRC8wxString
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       wxEVT_COMMAND_LIST_COL_BEGIN_DRAG

-      ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
-      OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent
+      ;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
       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
       __vft14wxListTextCtrl8wxObject

-      ;wxListCtrl::SetItemSpacing(int,unsigned long)
-      SetItemSpacing__10wxListCtrlFiUl
+      ;wxGenericListCtrl::SetItemCount(long)
+      SetItemCount__17wxGenericListCtrlFl

       ;wxListMainWindow::SetItemCount(long)
       SetItemCount__16wxListMainWindowFl
       ;wxListMainWindow::SetItemCount(long)
       SetItemCount__16wxListMainWindowFl

-      ;wxListCtrl::SetDropTarget(wxDropTarget*)
-      SetDropTarget__10wxListCtrlFP12wxDropTarget

       ;wxListMainWindow::RecalculatePositions(unsigned long)
       RecalculatePositions__16wxListMainWindowFUl
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent
       ;wxListMainWindow::RecalculatePositions(unsigned long)
       RecalculatePositions__16wxListMainWindowFUl
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent

-      ;wxListLineDataArray::operator=(const wxListLineDataArray&)
-      __as__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
+      OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent
+      ;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
       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
       ;wxListHeaderData::SetItem(const wxListItem&)
       SetItem__16wxListHeaderDataFRC10wxListItem

-      ;wxListCtrl::SetItem(wxListItem&)
-      SetItem__10wxListCtrlFR10wxListItem

       ;wxListMainWindow::SetItemState(long,long,long)
       SetItemState__16wxListMainWindowFlN21
       ;wxListMainWindow::SetImageList(wxImageList*,int)
       SetImageList__16wxListMainWindowFP11wxImageListi
       ;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
       ;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
       ;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
       ;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
       ;wxListMainWindow::GetColumn(int,wxListItem&) const
       GetColumn__16wxListMainWindowCFiR10wxListItem

+      ;wxGenericListCtrl::DeleteColumn(int)
+      DeleteColumn__17wxGenericListCtrlFi

       ;wxListMainWindow::CacheLineData(unsigned int)
       CacheLineData__16wxListMainWindowFUi
       ;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
       ;wxConstructorForwxListCtrl()
       wxConstructorForwxListCtrl__Fv
       list_ctrl_compare_func_2


@@ -9217,8 +9272,8 @@ EXPORTS
       __dt__16wxListMainWindowFv
       ;wxListHeaderWindow::wxListHeaderWindow()
       __ct__18wxListHeaderWindowFv
       __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()
       ;wxListLineData::SetAttr(wxListItemAttr*)
       SetAttr__14wxListLineDataFP14wxListItemAttr
       ;wxListMainWindow::RefreshSelected()


@@ -9229,14 +9284,20 @@ EXPORTS
       Insert__19wxListLineDataArrayFRC14wxListLineDataUiT2
       ;wxListItemData::GetX() const
       GetX__14wxListItemDataCFv
       Insert__19wxListLineDataArrayFRC14wxListLineDataUiT2
       ;wxListItemData::GetX() const
       GetX__14wxListItemDataCFv

-      ;wxListCtrl::GetTextColour() const
-      GetTextColour__10wxListCtrlCFv
+      ;wxGenericListCtrl::GetTextColour() const
+      GetTextColour__17wxGenericListCtrlCFv

       ;wxListMainWindow::GetHeaderWidth() const
       GetHeaderWidth__16wxListMainWindowCFv
       ;wxListMainWindow::GetHeaderWidth() const
       GetHeaderWidth__16wxListMainWindowCFv

+      ;wxGenericListCtrl::GetForegroundColour() const
+      GetForegroundColour__17wxGenericListCtrlCFv

       ;wxListTextCtrl::GetEventTable() const
       GetEventTable__14wxListTextCtrlCFv
       ;wxListTextCtrl::GetEventTable() const
       GetEventTable__14wxListTextCtrlCFv

+      ;wxGenericListCtrl::DoPopupMenu(wxMenu*,int,int)
+      DoPopupMenu__17wxGenericListCtrlFP6wxMenuiT2

       ;wxListMainWindow::DoDeleteAllItems()
       DoDeleteAllItems__16wxListMainWindowFv
       ;wxListMainWindow::DoDeleteAllItems()
       DoDeleteAllItems__16wxListMainWindowFv

+      ;wxwxListItemDataListNode::DeleteData()
+      DeleteData__24wxwxListItemDataListNodeFv

       ;wxListLineData::wxListLineData(wxListMainWindow*)
       __ct__14wxListLineDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_SET_INFO
       ;wxListLineData::wxListLineData(wxListMainWindow*)
       __ct__14wxListLineDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_SET_INFO


@@ -9253,42 +9314,46 @@ EXPORTS
       sm_classwxListMainWindow__16wxListMainWindow
       ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
       __ct__17wxListRenameTimerFP16wxListMainWindow
       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
+      ;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
       ;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
       ;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
       ;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
       ;wxListHeaderWindow::OnMouse(wxMouseEvent&)
       OnMouse__18wxListHeaderWindowFR12wxMouseEvent

+      ;wxGenericListCtrl::OnIdle(wxIdleEvent&)
+      OnIdle__17wxGenericListCtrlFR11wxIdleEvent
+      ;wxGenericListCtrl::OnGetItemAttr(long) const
+      OnGetItemAttr__17wxGenericListCtrlCFl

       ;wxListTextCtrl::OnChar(wxKeyEvent&)
       OnChar__14wxListTextCtrlFR10wxKeyEvent
       ;wxListTextCtrl::OnChar(wxKeyEvent&)
       OnChar__14wxListTextCtrlFR10wxKeyEvent

-      ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const
-      Index__19wxListLineDataArrayCFRC14wxListLineDataUl
-      ;wxListCtrl::GetItemTextColour(long) const
-      GetItemTextColour__10wxListCtrlCFl
+      ;wxGenericListCtrl::GetItemText(long) const
+      GetItemText__17wxGenericListCtrlCFl

       ;wxListMainWindow::GetItemRect(long,wxRect&) const
       GetItemRect__16wxListMainWindowCFlR6wxRect
       ;wxListMainWindow::GetItemRect(long,wxRect&) const
       GetItemRect__16wxListMainWindowCFlR6wxRect

-      ;wxListCtrl::GetItemBackgroundColour(long) const
-      GetItemBackgroundColour__10wxListCtrlCFl
-      ;wxListCtrl::FindItem(long,const wxString&,unsigned long)
-      FindItem__10wxListCtrlFlRC8wxStringUl
-      ;wxListCtrl::SetItemState(long,long,long)
-      SetItemState__10wxListCtrlFlN21
+      ;wxGenericListCtrl::GetItemPosition(long,wxPoint&) const
+      GetItemPosition__17wxGenericListCtrlCFlR7wxPoint
+      ;wxListLineData::SetImage(int,int)
+      SetImage__14wxListLineDataFiT1

       ;wxListHeaderData::wxListHeaderData(const wxListItem&)
       __ct__16wxListHeaderDataFRC10wxListItem
       ;wxListHeaderData::SetWidth(int)
       ;wxListHeaderData::wxListHeaderData(const wxListItem&)
       __ct__16wxListHeaderDataFRC10wxListItem
       ;wxListHeaderData::SetWidth(int)


@@ -9297,157 +9362,152 @@ EXPORTS
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1
       SetPosition__16wxListHeaderDataFiT1
       ;wxListItemData::SetPosition(int,int)
       SetPosition__14wxListItemDataFiT1

-      ;wxListLineData::SetImage(int,int)
-      SetImage__14wxListLineDataFiT1

       ;wxListHeaderData::SetHeight(int)
       SetHeight__16wxListHeaderDataFi
       ;wxListHeaderData::SetFormat(int)
       SetFormat__16wxListHeaderDataFi
       ;wxListHeaderData::SetHeight(int)
       SetHeight__16wxListHeaderDataFi
       ;wxListHeaderData::SetFormat(int)
       SetFormat__16wxListHeaderDataFi

-      ;wxListCtrl::SetColumnWidth(int,int)
-      SetColumnWidth__10wxListCtrlFiT1

       ;wxListMainWindow::RefreshLines(unsigned int,unsigned int)
       RefreshLines__16wxListMainWindowFUiT1
       ;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
       ;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
       ;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
       ;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
       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv
       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv

+      ;wxConstructorForwxGenericListCtrl()
+      wxConstructorForwxGenericListCtrl__Fv

       __vft16wxListMainWindow14wxScrollHelper
       ;wxListMainWindow::UpdateCurrent()
       UpdateCurrent__16wxListMainWindowFv
       ;wxListMainWindow::Thaw()
       Thaw__16wxListMainWindowFv
       __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::SetFocus()
       SetFocus__16wxListMainWindowFv
       ;wxListMainWindow::InitScrolling()
       InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv

+      ;wxGenericListCtrl::GetSelectedItemCount() const
+      GetSelectedItemCount__17wxGenericListCtrlCFv

       ;wxListMainWindow::GetLineHeight() const
       GetLineHeight__16wxListMainWindowCFv
       ;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
       ;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
       ;wxListLineData::GetAttr() const
       GetAttr__14wxListLineDataCFv

+      ;wxGenericListCtrl::Freeze()
+      Freeze__17wxGenericListCtrlFv

       ;wxListMainWindow::Freeze()
       Freeze__16wxListMainWindowFv
       ;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
       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
       ;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
       ;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
       ;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
       ;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
       ;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::GetItemSpacing(unsigned long)
       GetItemSpacing__16wxListMainWindowFUl

-      ;wxListCtrl::GetItemPosition(long,wxPoint&) const
-      GetItemPosition__10wxListCtrlCFlR7wxPoint

       ;wxListMainWindow::FindItem(long,const wxString&,unsigned long)
       FindItem__16wxListMainWindowFlRC8wxStringUl
       ;wxListMainWindow::EditLabel(long)
       EditLabel__16wxListMainWindowFl
       ;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
       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
       ;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
       ;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
       ;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
       ;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
       ;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
       wxSizeTCmpFn
       ;wxConstructorForwxListItem()
       wxConstructorForwxListItem__Fv


@@ -9455,26 +9515,24 @@ EXPORTS
       __dt__19wxListLineDataArrayFv
       ;wxListItemData::~wxListItemData()
       __dt__14wxListItemDataFv
       __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
       ;wxListMainWindow::GetSelectedItemCount() const
       GetSelectedItemCount__16wxListMainWindowCFv
       ;wxListMainWindow::Init()
       Init__16wxListMainWindowFv
       ;wxListHeaderData::Init()
       Init__16wxListHeaderDataFv
       ;wxListMainWindow::GetSelectedItemCount() const
       GetSelectedItemCount__16wxListMainWindowCFv

-      ;wxListCtrl::GetSelectedItemCount() const
-      GetSelectedItemCount__10wxListCtrlCFv

       ;wxListHeaderWindow::GetEventTable() const
       GetEventTable__18wxListHeaderWindowCFv
       ;wxListMainWindow::GetDummyLine() const
       GetDummyLine__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()
       ;wxListTextCtrl::Finish()
       Finish__14wxListTextCtrlFv
       ;wxListMainWindow::DeleteEverything()


@@ -9483,28 +9541,29 @@ EXPORTS
       DeleteData__26wxwxListHeaderDataListNodeFv
       ;wxListMainWindow::DeleteAllItems()
       DeleteAllItems__16wxListMainWindowFv
       DeleteData__26wxwxListHeaderDataListNodeFv
       ;wxListMainWindow::DeleteAllItems()
       DeleteAllItems__16wxListMainWindowFv

-      ;wxListCtrl::DeleteAllColumns()
-      DeleteAllColumns__10wxListCtrlFv
+      ;wxGenericListCtrl::CreateHeaderWindow()
+      CreateHeaderWindow__17wxGenericListCtrlFv

       ;wxListTextCtrl::AcceptChanges()
       AcceptChanges__14wxListTextCtrlFv
       ;wxListTextCtrl::AcceptChanges()
       AcceptChanges__14wxListTextCtrlFv

-      ;wxListCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
-      Create__10wxListCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      ;wxListMainWindow::GetTextLength(const wxString&) const
+      GetTextLength__16wxListMainWindowCFRC8wxString

       wxEVT_COMMAND_LIST_GET_INFO
       ;wxListMainWindow::sm_eventTableEntries
       sm_eventTableEntries__16wxListMainWindow
       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
       wxEVT_COMMAND_LIST_ITEM_SELECTED
       wxEVT_COMMAND_LIST_END_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__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&)
       ;wxListMainWindow::OnScroll(wxScrollWinEvent&)
       OnScroll__16wxListMainWindowFR16wxScrollWinEvent
       ;wxListHeaderWindow::OnPaint(wxPaintEvent&)


@@ -9515,20 +9574,20 @@ EXPORTS
       OnKeyUp__14wxListTextCtrlFR10wxKeyEvent
       ;wxListMainWindow::OnChar(wxKeyEvent&)
       OnChar__16wxListMainWindowFR10wxKeyEvent
       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
+      ;wxGenericListCtrl::GetItemTextColour(long) const
+      GetItemTextColour__17wxGenericListCtrlCFl

       ;wxListMainWindow::GetItemPosition(long,wxPoint&) const
       GetItemPosition__16wxListMainWindowCFlR7wxPoint
       ;wxListMainWindow::GetItemPosition(long,wxPoint&) const
       GetItemPosition__16wxListMainWindowCFlR7wxPoint

-      ;wxListCtrl::GetItemData(long) const
-      GetItemData__10wxListCtrlCFl
+      ;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
       ;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
       ;wxListLineData::GetText(int) const
       GetText__14wxListLineDataCFi
       __vft26wxwxListHeaderDataListNode10wxNodeBase


@@ -9539,52 +9598,40 @@ EXPORTS
       SetItem__16wxListMainWindowFR10wxListItem
       ;wxListItemData::SetItem(const wxListItem&)
       SetItem__14wxListItemDataFRC10wxListItem
       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
       ;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
       ;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
       ;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) const
       GetItemState__16wxListMainWindowCFlT1
       ;wxListMainWindow::GetLineIconRect(unsigned int) const
       GetLineIconRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetItemState(long,long) const
       GetItemState__16wxListMainWindowCFlT1

-      ;wxListCtrl::GetItemRect(long,wxRect&,int) const
-      GetItemRect__10wxListCtrlCFlR6wxRecti

       ;wxListMainWindow::GetColumnWidth(int) const
       GetColumnWidth__16wxListMainWindowCFi
       ;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
       ;wxListLineDataArray::Add(const wxListLineData&,unsigned int)
       Add__19wxListLineDataArrayFRC14wxListLineDataUi

-      ;wxListCtrl::wxListCtrl()
-      __ct__10wxListCtrlFv
+      ;wxListLineDataArray::DoEmpty()
+      DoEmpty__19wxListLineDataArrayFv

       ;wxConstructorForwxListView()
       wxConstructorForwxListView__Fv
       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__Fv
       ;wxConstructorForwxListView()
       wxConstructorForwxListView__Fv
       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__Fv

-      ;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
       ;wxListMainWindow::RefreshAll()
       RefreshAll__16wxListMainWindowFv
       ;wxListMainWindow::HitTestLine(unsigned int,int,int) const


@@ -9595,22 +9642,14 @@ EXPORTS
       GetWidth__14wxListItemDataCFv
       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv
       GetWidth__14wxListItemDataCFv
       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv

-      ;wxListCtrl::GetForegroundColour() const
-      GetForegroundColour__10wxListCtrlCFv

       ;wxListMainWindow::GetEventTable() const
       GetEventTable__16wxListMainWindowCFv
       ;wxListMainWindow::GetEventTable() const
       GetEventTable__16wxListMainWindowCFv

+      ;wxGenericListCtrl::GetCountPerPage() const
+      GetCountPerPage__17wxGenericListCtrlCFv

       ;wxListMainWindow::GetCountPerPage() const
       GetCountPerPage__16wxListMainWindowCFv
       ;wxListHeaderWindow::DrawCurrent()
       DrawCurrent__18wxListHeaderWindowFv
       ;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
       ;wxListItemData::wxListItemData(wxListMainWindow*)
       __ct__14wxListItemDataFP16wxListMainWindow
       wxEVT_COMMAND_LIST_COL_END_DRAG


@@ -9802,8 +9841,6 @@ EXPORTS
       OnOK__20wxGenericPrintDialogFR14wxCommandEvent
       ;wxGenericPrintDialog::wxGenericPrintDialog(wxWindow*,wxPrintDialogData*)
       __ct__20wxGenericPrintDialogFP8wxWindowP17wxPrintDialogData
       OnOK__20wxGenericPrintDialogFR14wxCommandEvent
       ;wxGenericPrintDialog::wxGenericPrintDialog(wxWindow*,wxPrintDialogData*)
       __ct__20wxGenericPrintDialogFP8wxWindowP17wxPrintDialogData

-      ;wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow*,wxPrintSetupData*)
-      __ct__25wxGenericPrintSetupDialogFP8wxWindowP16wxPrintSetupData

       ;wxGenericPrintDialog::ShowModal()
       ShowModal__20wxGenericPrintDialogFv
       ;wxGenericPageSetupDialog::TransferDataFromWindow()
       ;wxGenericPrintDialog::ShowModal()
       ShowModal__20wxGenericPrintDialogFv
       ;wxGenericPageSetupDialog::TransferDataFromWindow()


@@ -11761,6 +11798,8 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxButton::Command(wxCommandEvent&)
       Command__8wxButtonFR14wxCommandEvent
     ;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*)
       ;wxButton::SetTmpDefault()
       SetTmpDefault__8wxButtonFv
       ;wxButton::WindowProc(unsigned int,void*,void*)


@@ -11777,8 +11816,6 @@ EXPORTS
       __dt__8wxButtonFv
       ;wxButton::SendClickEvent()
       SendClickEvent__8wxButtonFv
       __dt__8wxButtonFv
       ;wxButton::SendClickEvent()
       SendClickEvent__8wxButtonFv

-      ;wxButton::UpdateDefaultStyle(wxWindow*,wxWindow*)
-      UpdateDefaultStyle__8wxButtonFP8wxWindowT1

       ;wxConstructorForwxButton()
       wxConstructorForwxButton__Fv
       ;wxButton::GetDefaultSize()
       ;wxConstructorForwxButton()
       wxConstructorForwxButton__Fv
       ;wxButton::GetDefaultSize()


@@ -11865,6 +11902,8 @@ EXPORTS
       SetFont__14wxCheckListBoxFRC6wxFont
       ;wxCheckListBox::OnLeftClick(wxMouseEvent&)
       OnLeftClick__14wxCheckListBoxFR12wxMouseEvent
       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
   ;From object file:  ..\os2\choice.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxChoice::DoGetItemClientData(int) const


@@ -12059,27 +12098,20 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxCursor::wxCursor(const wxImage&)
       __ct__8wxCursorFRC7wxImage
     ;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
       ;wxCursor::wxCursor(const wxString&,long,int,int)
       __ct__8wxCursorFRC8wxStringliT3

-      __vft8wxCursor8wxObject

       ;wxCursor::wxCursor(int)
       __ct__8wxCursorFi
       ;wxCursor::wxCursor(int)
       __ct__8wxCursorFi

-      ;wxConstructorForwxCursor()
-      wxConstructorForwxCursor__Fv

       ;wxCursorRefData::wxCursorRefData()
       __ct__15wxCursorRefDataFv
       ;wxCursorRefData::wxCursorRefData()
       __ct__15wxCursorRefDataFv

-      ;wxCursor::SetHCURSOR(unsigned long)
-      SetHCURSOR__8wxCursorFUl
+      ;wxConstructorForwxCursor()
+      wxConstructorForwxCursor__Fv
+      ;wxCursorRefData::Free()
+      Free__15wxCursorRefDataFv

       ;wxCursor::sm_classwxCursor
       sm_classwxCursor__8wxCursor
       ;wxCursor::sm_classwxCursor
       sm_classwxCursor__8wxCursor

-      ;wxCursor::FreeResource(unsigned long)
-      FreeResource__8wxCursorFUl

       ;wxSetCursor(const wxCursor&)
       wxSetCursor__FRC8wxCursor
       ;wxSetCursor(const wxCursor&)
       wxSetCursor__FRC8wxCursor

-      ;wxCursor::~wxCursor()
-      __dt__8wxCursorFv

       ;wxCursor::wxCursor(const char*,int,int,int,int,const char*)
       __ct__8wxCursorFPCciN32T1
       __vft15wxCursorRefData15wxObjectRefData
       ;wxCursor::wxCursor(const char*,int,int,int,int,const char*)
       __ct__8wxCursorFPCciN32T1
       __vft15wxCursorRefData15wxObjectRefData


@@ -12630,6 +12662,8 @@ EXPORTS
       __ct__12wxFileDialogFP8wxWindowRC8wxStringN32lRC7wxPoint
       ;wxFileDialog::ShowModal()
       ShowModal__12wxFileDialogFv
       __ct__12wxFileDialogFP8wxWindowRC8wxStringN32lRC7wxPoint
       ;wxFileDialog::ShowModal()
       ShowModal__12wxFileDialogFv

+      ;wxFileDialog::GetPaths(wxArrayString&) const
+      GetPaths__12wxFileDialogCFR13wxArrayString

       __vft12wxFileDialog8wxObject
       ;wxFileDialog::sm_classwxFileDialog
       sm_classwxFileDialog__12wxFileDialog
       __vft12wxFileDialog8wxObject
       ;wxFileDialog::sm_classwxFileDialog
       sm_classwxFileDialog__12wxFileDialog


@@ -12748,12 +12782,6 @@ EXPORTS
       ;wxConstructorForwxFontDialog()
       wxConstructorForwxFontDialog__Fv
       __vft12wxFontDialog8wxObject
       ;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
       ;wxFontDialog::ShowModal()
       ShowModal__12wxFontDialogFv
       ;wxFontDialog::sm_classwxFontDialog


@@ -12787,6 +12815,8 @@ EXPORTS
       wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPUlT3PlR8wxStringP6wxFont
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
       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*)
       ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
       wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
       ;wxGpiStrcmp(char*,char*)


@@ -12799,6 +12829,8 @@ EXPORTS
       HandleMenuSelect__7wxFrameFUsT1Ul
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv
       HandleMenuSelect__7wxFrameFUsT1Ul
       ;wxFrame::OS2TranslateMessage(void**)
       OS2TranslateMessage__7wxFrameFPPv

+      ;wxFrame::SendSizeEvent()
+      SendSizeEvent__7wxFrameFv

       ;wxFrame::HandlePaint()
       HandlePaint__7wxFrameFv
       ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)
       ;wxFrame::HandlePaint()
       HandlePaint__7wxFrameFv
       ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)


@@ -13559,14 +13591,14 @@ EXPORTS
       GetDescription__14wxFileTypeImplCFP8wxString
       ;wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString&)
       EnumAllFileTypes__22wxMimeTypesManagerImplFR13wxArrayString
       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::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
       ;wxFileTypeImpl::GetCommand(const char*) const
       GetCommand__14wxFileTypeImplCFPCc
       ;wxFileTypeImpl::GetMimeTypes(wxArrayString&) const


@@ -13620,8 +13652,6 @@ EXPORTS
       DeleteAllPages__10wxNotebookFv
       ;wxNotebook::SetPageText(int,const wxString&)
       SetPageText__10wxNotebookFiRC8wxString
       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
       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
       ;wxNotebook::ChangePage(int,int)
       ChangePage__10wxNotebookFiT1


@@ -13631,6 +13661,8 @@ EXPORTS
       SetPageSize__10wxNotebookFRC6wxSize
       ;wxNotebook::AddPage(wxWindow*,const wxString&,unsigned long,int)
       AddPage__10wxNotebookFP8wxWindowRC8wxStringUli
       SetPageSize__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)
       ;wxNotebook::OnSize(wxSizeEvent&)
       OnSize__10wxNotebookFR11wxSizeEvent
       ;wxNotebook::SetSelection(int)


@@ -13639,8 +13671,6 @@ EXPORTS
       SetPageImage__10wxNotebookFiT1
       ;wxNotebook::DoPhase(int)
       DoPhase__10wxNotebookFi
       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&)
       ;wxNotebook::GetPageCount() const
       GetPageCount__10wxNotebookCFv
       ;wxNotebook::wxNotebook(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)


@@ -13661,8 +13691,6 @@ EXPORTS
       wxConstructorForwxNotebook__Fv
       ;wxConstructorForwxNotebookEvent()
       wxConstructorForwxNotebookEvent__Fv
       wxConstructorForwxNotebook__Fv
       ;wxConstructorForwxNotebookEvent()
       wxConstructorForwxNotebookEvent__Fv

-      ;wxNotebook::OS2OnNotify(int,void*,void**)
-      OS2OnNotify__10wxNotebookFiPvPPv

       ;wxNotebook::Init()
       Init__10wxNotebookFv
       ;wxNotebook::sm_classwxNotebook
       ;wxNotebook::Init()
       Init__10wxNotebookFv
       ;wxNotebook::sm_classwxNotebook


@@ -13670,17 +13698,17 @@ EXPORTS
       wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
       ;wxNotebook::sm_eventTable
       sm_eventTable__10wxNotebook
       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
       __vft10wxNotebook8wxObject
       ;wxNotebook::GetPageImage(int) const
       GetPageImage__10wxNotebookCFi

-      ;wxNotebook::RemovePage(int)
-      RemovePage__10wxNotebookFi

       ;wxNotebook::InsertPage(int,wxWindow*,const wxString&,unsigned long,int)
       InsertPage__10wxNotebookFiP8wxWindowRC8wxStringUlT1
       ;wxNotebook::InsertPage(int,wxWindow*,const wxString&,unsigned long,int)
       InsertPage__10wxNotebookFiP8wxWindowRC8wxStringUlT1

+      ;wxNotebook::DoRemovePage(int)
+      DoRemovePage__10wxNotebookFi

       ;wxNotebook::GetEventTable() const
       GetEventTable__10wxNotebookCFv
       ;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&)
       ;wxNotebook::GetRowCount() const
       GetRowCount__10wxNotebookCFv
       ;wxNotebook::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)


@@ -13872,6 +13900,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
       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
       ;wxRadioBox::FindString(const wxString&) const
       FindString__10wxRadioBoxCFRC8wxString
       __vft10wxRadioBox8wxObject


@@ -14168,6 +14197,8 @@ EXPORTS
       m_svAllSpins__10wxSpinCtrl
       ;wxSpinCtrl::DoGetPosition(int*,int*) const
       DoGetPosition__10wxSpinCtrlCFPiT1
       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
       ;wxSpinCtrl::DoMoveWindow(int,int,int,int)
       DoMoveWindow__10wxSpinCtrlFiN31
       wxSpinCtrlWndProc


@@ -14201,11 +14232,19 @@ EXPORTS
       GetValue__10wxSpinCtrlCFv
   ;From object file:  ..\os2\statbmp.cpp
     ;PUBDEFs (Symbols available from object file):
       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
       __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&)
       ;wxStaticBitmap::sm_classwxStaticBitmap
       sm_classwxStaticBitmap__14wxStaticBitmap
       ;wxStaticBitmap::SetImage(const wxGDIImage&)