From 32b26030fe5edcf2b9d73b01aa5980a55db5d92b Mon Sep 17 00:00:00 2001 From: David Webster Date: Tue, 15 Oct 2002 14:12:23 +0000 Subject: [PATCH] More dll updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/os2jpeg.def | 6 +++--- src/os2/os2png.def | 3 +-- src/os2/wx23.def | 44 ++++++++++++++++++++++++-------------------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/os2/os2jpeg.def b/src/os2/os2jpeg.def index e8a935a8ad..b4f69492fb 100644 --- a/src/os2/os2jpeg.def +++ b/src/os2/os2jpeg.def @@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL CODE LOADONCALL EXPORTS -;From library: H:\DEV\WX24\WXWINDOWS\LIB\os2jpeg.lib +;From library: H:\Dev\wx24\WxWindows\lib\os2jpeg.lib ;From object file: ..\jpeg\jcomapi.c ;PUBDEFs (Symbols available from object file): jpeg_destroy @@ -219,7 +219,7 @@ EXPORTS ;From object file: ..\jpeg\jdinput.c ;PUBDEFs (Symbols available from object file): reset_input_controller - start_input_pass2 + start_input_pass jinit_input_controller finish_input_pass consume_markers @@ -261,8 +261,8 @@ EXPORTS ;From object file: ..\jpeg\jdcoefct.c ;PUBDEFs (Symbols available from object file): decompress_data - start_input_pass decompress_smooth_data + start_input_pass2 decompress_onepass dummy_consume_data consume_data diff --git a/src/os2/os2png.def b/src/os2/os2png.def index 396c76832b..fee334e465 100644 --- a/src/os2/os2png.def +++ b/src/os2/os2png.def @@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL CODE LOADONCALL EXPORTS -;From library: H:\DEV\WX24\WXWINDOWS\LIB\os2png.lib +;From library: H:\Dev\wx24\WxWindows\lib\os2png.lib ;From object file: ..\png\png.c ;PUBDEFs (Symbols available from object file): png_free_data @@ -20,7 +20,6 @@ EXPORTS png_info_init png_destroy_info_struct png_get_io_ptr - png_libpng_ver png_get_libpng_ver png_set_sig_bytes png_check_sig diff --git a/src/os2/wx23.def b/src/os2/wx23.def index 1c249fb752..7da5b841f2 100644 --- a/src/os2/wx23.def +++ b/src/os2/wx23.def @@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL CODE LOADONCALL EXPORTS -;From library: H:\DEV\WX24\WXWINDOWS\LIB\wx.lib +;From library: H:\Dev\wx24\WxWindows\lib\wx.lib ;From object file: dummy.cpp ;PUBDEFs (Symbols available from object file): wxDummyChar @@ -2256,10 +2256,10 @@ EXPORTS GetTimes__10wxFileNameCFP10wxDateTimeN21 ;wxFileName::Clear() Clear__10wxFileNameFv - ;wxFileName::wxFileExists() - wxFileExists__10wxFileNameFv ;wxFileName::GetFullName() const GetFullName__10wxFileNameCFv + ;wxFileName::DirExists() + DirExists__10wxFileNameFv ;wxFileName::AssignHomeDir() AssignHomeDir__10wxFileNameFv ;wxFileName::PrependDir(const wxString&) @@ -2276,12 +2276,12 @@ EXPORTS Touch__10wxFileNameFv ;wxFileName::FileName(const wxString&) FileName__10wxFileNameFRC8wxString - ;wxFileName::wxPathExists(const wxString&) - wxPathExists__10wxFileNameFRC8wxString ;wxFileName::SetFullName(const wxString&) SetFullName__10wxFileNameFRC8wxString ;wxFileName::GetCwd(const wxString&) GetCwd__10wxFileNameFRC8wxString + ;wxFileName::DirExists(const wxString&) + DirExists__10wxFileNameFRC8wxString ;wxFileName::AssignCwd(const wxString&) AssignCwd__10wxFileNameFRC8wxString ;wxFileName::Assign(const wxString&,const wxString&,const wxString&,const wxString&,wxPathFormat) @@ -2294,8 +2294,8 @@ EXPORTS GetVolumeSeparator__10wxFileNameF12wxPathFormat ;wxFileName::RemoveDir(int) RemoveDir__10wxFileNameFi - ;wxFileName::wxPathExists() - wxPathExists__10wxFileNameFv + ;wxFileName::FileExists() + FileExists__10wxFileNameFv ;wxFileName::SetCwd() SetCwd__10wxFileNameFv ;wxFileName::GetShortPath() const @@ -2320,8 +2320,6 @@ EXPORTS Rmdir__10wxFileNameFv ;wxFileName::GetLongPath() const GetLongPath__10wxFileNameCFv - ;wxFileName::wxFileExists(const wxString&) - wxFileExists__10wxFileNameFRC8wxString ;wxFileName::InsertDir(int,const wxString&) InsertDir__10wxFileNameFiRC8wxString ;wxFileName::Assign(const wxString&,const wxString&,wxPathFormat) @@ -2346,6 +2344,8 @@ EXPORTS SetCwd__10wxFileNameFRC8wxString ;wxFileName::Rmdir(const wxString&) Rmdir__10wxFileNameFRC8wxString + ;wxFileName::FileExists(const wxString&) + FileExists__10wxFileNameFRC8wxString ;From object file: ..\common\filesys.cpp ;PUBDEFs (Symbols available from object file): __vft19wxFileSystemHandler8wxObject @@ -2623,8 +2623,8 @@ EXPORTS Close__5wxFTPFv ;wxFTP::MkDir(const wxString&) MkDir__5wxFTPFRC8wxString - ;wxFTP::wxFileExists(const wxString&) - wxFileExists__5wxFTPFRC8wxString + ;wxFTP::FileExists(const wxString&) + FileExists__5wxFTPFRC8wxString ;wxFTP::Rename(const wxString&,const wxString&) Rename__5wxFTPFRC8wxStringT1 ;wxFTP::wxFTP() @@ -5459,6 +5459,8 @@ EXPORTS WC2MB__12wxMBConvUTF8CFPcPCwUi ;wxMBConvUTF8::MB2WC(wchar_t*,const char*,unsigned int) const MB2WC__12wxMBConvUTF8CFPwPCcUi + ;wxMBConv::~wxMBConv() + __dt__8wxMBConvFv __vft12wxMBConvUTF88wxMBConv wxConvCurrent ;wxMBConv::WC2MB(char*,const wchar_t*,unsigned int) const @@ -6405,8 +6407,6 @@ EXPORTS wxStripMenuCodes__FPCcPc ;wxSafeYield(wxWindow*) wxSafeYield__FP8wxWindow - ;StringMatch(const char*,const char*,unsigned long,unsigned long) - StringMatch__FPCcT1UlT3 ;wxFindMenuItemId(wxFrame*,const wxString&,const wxString&) wxFindMenuItemId__FP7wxFrameRC8wxStringT2 ;wxGetUserName() @@ -7903,13 +7903,13 @@ EXPORTS ;wxGenericDirCtrl::OnEndEditItem(wxTreeEvent&) OnEndEditItem__16wxGenericDirCtrlFR11wxTreeEvent __vft13wxDirItemData12wxClientData - ;wxGenericDirCtrl::Init() - Init__16wxGenericDirCtrlFv - __vft19wxDirFilterListCtrl15wxItemContainer ;wxDirItemData::~wxDirItemData() __dt__13wxDirItemDataFv + __vft19wxDirFilterListCtrl15wxItemContainer ;wxGenericDirCtrl::ParseFilter(const wxString&,wxArrayString&,wxArrayString&) ParseFilter__16wxGenericDirCtrlFRC8wxStringR13wxArrayStringT2 + ;wxGenericDirCtrl::Init() + Init__16wxGenericDirCtrlFv ;wxDirFilterListCtrl::GetEventTable() const GetEventTable__19wxDirFilterListCtrlCFv ;wxGenericDirCtrl::ExpandDir(wxTreeItemId) @@ -7918,14 +7918,14 @@ EXPORTS sm_eventTableEntries__19wxDirFilterListCtrl ;wxDirFilterListCtrl::OnSelFilter(wxCommandEvent&) OnSelFilter__19wxDirFilterListCtrlFR14wxCommandEvent - ;wxGenericDirCtrl::SetFilterIndex(int) - SetFilterIndex__16wxGenericDirCtrlFi ;wxDirFilterListCtrl::FillFilterList(const wxString&,int) FillFilterList__19wxDirFilterListCtrlFRC8wxStringi - ;wxGenericDirCtrl::ReCreateTree() - ReCreateTree__16wxGenericDirCtrlFv + ;wxGenericDirCtrl::SetFilterIndex(int) + SetFilterIndex__16wxGenericDirCtrlFi ;wxGenericDirCtrl::SetupSections() SetupSections__16wxGenericDirCtrlFv + ;wxGenericDirCtrl::ReCreateTree() + ReCreateTree__16wxGenericDirCtrlFv ;wxGenericDirCtrl::ShowHidden(unsigned long) ShowHidden__16wxGenericDirCtrlFUl ;wxGenericDirCtrl::OnCollapseItem(wxTreeEvent&) @@ -9366,6 +9366,8 @@ EXPORTS __ct__17wxListRenameTimerFP16wxListMainWindow ;wxGenericListCtrl::InsertColumn(long,const wxString&,int,int) InsertColumn__17wxGenericListCtrlFlRC8wxStringiT3 + ;wxListLineData::DrawTextFormatted(wxDC*,const wxString&,int,int,int,int) + DrawTextFormatted__14wxListLineDataFP4wxDCRC8wxStringiN33 ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const Index__19wxListLineDataArrayCFRC14wxListLineDataUl ;wxGenericListCtrl::sm_eventTableEntries @@ -11099,6 +11101,8 @@ EXPORTS FindCellByPos__10wxHtmlCellCFiT1 ;wxHtmlWordCell::Draw(wxDC&,int,int,int,int) Draw__14wxHtmlWordCellFR4wxDCiN32 + ;wxHtmlContainerCell::GetBackgroundColour() + GetBackgroundColour__19wxHtmlContainerCellFv ;wxHtmlContainerCell::Draw(wxDC&,int,int,int,int) Draw__19wxHtmlContainerCellFR4wxDCiN32 ;wxHtmlWidgetCell::Draw(wxDC&,int,int,int,int)