oops, have to commit this after accidentally committing intl.cpp to not break compila...

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 1d4803ddd8e279122f51b163d2cae62449ea2a62..51bf6cec96837052b8dd58e19ca347220c3dc976 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  H:\DEV\WX2\WXWINDOWS\LIB\wx.lib
+;From library:  H:\dev\wx2\wxwindows\lib\wx.lib
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
@@ -2059,8 +2059,6 @@ EXPORTS
       Assign__10wxFileNameFRC8wxString12wxPathFormat
       ;wxFileName::SetPath(const wxString&,wxPathFormat)
       SetPath__10wxFileNameFRC8wxString12wxPathFormat
-      ;wxFileName::Normalize(wxPathNormalize,const wxString&,wxPathFormat)
-      Normalize__10wxFileNameF15wxPathNormalizeRC8wxString12wxPathFormat
       ;wxFileName::IsWild(wxPathFormat)
       IsWild__10wxFileNameF12wxPathFormat
       ;wxFileName::GetTimes(wxDateTime*,wxDateTime*,wxDateTime*) const
@@ -2117,6 +2115,8 @@ EXPORTS
       AppendDir__10wxFileNameFRC8wxString
       ;wxFileName::SplitPath(const wxString&,wxString*,wxString*,wxString*,wxString*,wxPathFormat)
       SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
+      ;wxFileName::Normalize(int,const wxString&,wxPathFormat)
+      Normalize__10wxFileNameFiRC8wxString12wxPathFormat
       ;wxFileName::Mkdir(int,unsigned long)
       Mkdir__10wxFileNameFiUl
       ;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
@@ -2774,8 +2774,8 @@ EXPORTS
       CopyHashTable__17_wxHashTableBase2FPP21_wxHashTable_NodeBaseUiP17_wxHashTableBase2T1PFP17_wxHashTableBase2P21_wxHashTable_NodeBase_UlPFP21_wxHashTable_NodeBase_P21_wxHashTable_NodeBase
       ;wxStringHash::wxCharStringHash(const char*)
       wxCharStringHash__12wxStringHashFPCc
-      ;_wxHashTableBase2::s_primes
-      s_primes__17_wxHashTableBase2
+      ;_wxHashTableBase2::ms_primes
+      ms_primes__17_wxHashTableBase2
       ;_wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase*)
       DummyProcessNode__17_wxHashTableBase2FP21_wxHashTable_NodeBase
       ;_wxHashTableBase2::DeleteNodes(unsigned int,_wxHashTable_NodeBase**,void(*)(_wxHashTable_NodeBase*))
@@ -4133,12 +4133,12 @@ EXPORTS
       wxCreateDynamicObject__FPCc
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
-      ;wxObject::CloneRefData(wxObjectRefData*) const
-      CloneRefData__8wxObjectCFP15wxObjectRefData
       ;wxObject::CreateRefData() const
       CreateRefData__8wxObjectCFv
       ;wxClassInfo::sm_classTable
       sm_classTable__11wxClassInfo
+      ;wxObject::CloneRefData(const wxObjectRefData*) const
+      CloneRefData__8wxObjectCFPC15wxObjectRefData
       ;wxClassInfo::sm_first
       sm_first__11wxClassInfo
       ;wxObject::Ref(const wxObject&)
@@ -13528,8 +13528,6 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)
       Combine__8wxRegionFRC6wxRect10wxRegionOp
-      ;wxRegion::CloneData(wxObjectRefData*) const
-      CloneData__8wxRegionCFP15wxObjectRefData
       ;wxRegion::Offset(int,int)
       Offset__8wxRegionFiT1
       ;wxRegion::GetBox() const
@@ -13544,6 +13542,8 @@ EXPORTS
       __ct__8wxRegionFRC7wxPointT1
       ;wxRegion::Contains(int,int) const
       Contains__8wxRegionCFiT1
+      ;wxRegion::CloneData(const wxObjectRefData*) const
+      CloneData__8wxRegionCFPC15wxObjectRefData
       ;wxRegionIterator::GetY() const
       GetY__16wxRegionIteratorCFv
       ;wxConstructorForwxRegion()
@@ -14332,6 +14332,8 @@ EXPORTS
       CreateFrame__19wxTopLevelWindowOS2FRC8wxStringRC7wxPointRC6wxSize
       ;wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
       __dt__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::UpdateInternalSize(wxWindow*,int,int)
+      UpdateInternalSize__19wxTopLevelWindowOS2FP8wxWindowiT2
       ;wxTopLevelWindowOS2::ShowFullScreen(unsigned long,long)
       ShowFullScreen__19wxTopLevelWindowOS2FUll
       ;wxTopLevelWindowOS2::CreateDialog(unsigned long,const wxString&,const wxPoint&,const wxSize&)
@@ -14340,6 +14342,8 @@ EXPORTS
       DoShowWindow__19wxTopLevelWindowOS2Fi
       ;wxTopLevelWindowOS2::Init()
       Init__19wxTopLevelWindowOS2Fv
+      ;wxTopLevelWindowOS2::m_sbInitialized
+      m_sbInitialized__19wxTopLevelWindowOS2
       ;wxTopLevelWindowOS2::OS2GetCreateWindowFlags(long*) const
       OS2GetCreateWindowFlags__19wxTopLevelWindowOS2CFPl
       ;wxTopLevelWindowOS2::Iconize(unsigned long)
@@ -14358,8 +14362,6 @@ EXPORTS
       Maximize__19wxTopLevelWindowOS2FUl
       ;wxTopLevelWindowOS2::EnableCloseButton(unsigned long)
       EnableCloseButton__19wxTopLevelWindowOS2FUl
-      ;wxTopLevelWindowOS2::UpdateInternalSize(wxWindow*,int)
-      UpdateInternalSize__19wxTopLevelWindowOS2FP8wxWindowi
       ;wxTopLevelWindowOS2::DoGetClientSize(int*,int*) const
       DoGetClientSize__19wxTopLevelWindowOS2CFPiT1
       ;wxTopLevelWindowOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
@@ -14668,6 +14670,8 @@ EXPORTS
       ;wxWindow::WarpPointer(int,int)
       WarpPointer__8wxWindowFiT1
       wxCurrentPopupMenu
+      ;wxWindow::OS2Layout(int,int)
+      OS2Layout__8wxWindowFiT1
       ;wxWindow::MoveChildren(int)
       MoveChildren__8wxWindowFi
       ;wxWindow::HandleShow(unsigned long,int)