From 0367c1c0e82c6da38cea16c4bcef6583271789cc Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Fri, 6 Jul 2001 21:47:52 +0000
Subject: [PATCH] Fixes for OS/2 wxUniv merge.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/os2/dcclient.cpp |   23 +
 src/os2/frame.cpp    |  162 ++---
 src/os2/listbox.cpp  |    4 +-
 src/os2/makefile.va  |   46 +-
 src/os2/menu.cpp     |   66 +-
 src/os2/menuitem.cpp |   14 +-
 src/os2/notebook.cpp |   19 +
 src/os2/radiobox.cpp |   23 +
 src/os2/radiobut.cpp |    5 +-
 src/os2/window.cpp   |  438 ++++++------
 src/os2/wx23.def     | 1574 ++++++++++++------------------------------
 11 files changed, 851 insertions(+), 1523 deletions(-)

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index cdb7003da7..311c1025a3 100644
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -218,6 +218,29 @@ wxClientDC::wxClientDC(
     InitDC();
 } // end of wxClientDC::wxClientDC
 
+void wxClientDC::InitDC()
+{
+    wxWindowDC::InitDC();
+
+    // in wxUniv build we must manually do some DC adjustments usually
+    // performed by Windows for us
+#ifdef __WXUNIVERSAL__
+    wxPoint ptOrigin = m_canvas->GetClientAreaOrigin();
+    if ( ptOrigin.x || ptOrigin.y )
+    {
+        // no need to shift DC origin if shift is null
+        SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
+    }
+
+    // clip the DC to avoid overwriting the non client area
+    SetClippingRegion(wxPoint(0, 0), m_canvas->GetClientSize());
+#endif // __WXUNIVERSAL__
+} // end of wxClientDC::InitDC
+
+wxClientDC::~wxClientDC()
+{
+} // end of wxClientDC::~wxClientDC
+
 // ----------------------------------------------------------------------------
 // wxPaintDC
 // ----------------------------------------------------------------------------
diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 838197f4d4..a3b3f82dd0 100644
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
-// Purpose:     wxFrame
+// Purpose:     wxFrameOS2
 // Author:      David Webster
 // Modified by:
 // Created:     10/27/99
@@ -63,12 +63,16 @@ extern void  wxAssociateWinWithHandle( HWND      hWnd
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
-    EVT_ACTIVATE(wxFrame::OnActivate)
-    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxFrameOS2, wxFrameBase)
+    EVT_ACTIVATE(wxFrameOS2::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxFrameOS2::OnSysColourChanged)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrameOS2, wxWindow)
+
+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
+#endif
 
 // ============================================================================
 // implementation
@@ -80,9 +84,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #if wxUSE_STATUSBAR
 
 #if wxUSE_NATIVE_STATUSBAR
-    bool wxFrame::m_bUseNativeStatusBar = TRUE;
+    bool wxFrameOS2::m_bUseNativeStatusBar = TRUE;
 #else
-    bool wxFrame::m_bUseNativeStatusBar = FALSE;
+    bool wxFrameOS2::m_bUseNativeStatusBar = FALSE;
 #endif
 
 #endif //wxUSE_STATUSBAR
@@ -91,7 +95,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 // creation/destruction
 // ----------------------------------------------------------------------------
 
-void wxFrame::Init()
+void wxFrameOS2::Init()
 {
     m_bIconized = FALSE;
 
@@ -125,9 +129,9 @@ void wxFrame::Init()
     memset(&m_vSwpVScroll, 0, sizeof(SWP));
     memset(&m_vSwpStatusBar, 0, sizeof(SWP));
     memset(&m_vSwpToolBar, 0, sizeof(SWP));
-} // end of wxFrame::Init
+} // end of wxFrameOS2::Init
 
-bool wxFrame::Create(
+bool wxFrameOS2::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
 , const wxString&                   rsTitle
@@ -187,9 +191,9 @@ bool wxFrame::Create(
         wxModelessWindows.Append(this);
     }
     return(bOk);
-} // end of wxFrame::Create
+} // end of wxFrameOS2::Create
 
-wxFrame::~wxFrame()
+wxFrameOS2::~wxFrameOS2()
 {
     m_isBeingDeleted = TRUE;
 
@@ -231,12 +235,12 @@ wxFrame::~wxFrame()
                              );
         }
     }
-} // end of wxFrame::~wxFrame
+} // end of wxFrameOS2::~wxFrame
 
 //
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
 //
-void wxFrame::DoGetClientSize(
+void wxFrameOS2::DoGetClientSize(
   int*                              pX
 , int*                              pY
 ) const
@@ -254,13 +258,13 @@ void wxFrame::DoGetClientSize(
         *pX = vRect.xRight - vRect.xLeft;
     if (pY)
         *pY = vRect.yTop - vRect.yBottom;
-} // end of wxFrame::DoGetClientSize
+} // end of wxFrameOS2::DoGetClientSize
 
 //
 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWindows)
 //
-void wxFrame::DoSetClientSize(
+void wxFrameOS2::DoSetClientSize(
   int                               nWidth
 , int                               nHeight
 )
@@ -318,9 +322,9 @@ void wxFrame::DoSetClientSize(
                                           );
     vEvent.SetEventObject(this);
     GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxFrame::DoSetClientSize
+} // end of wxFrameOS2::DoSetClientSize
 
-void wxFrame::DoGetSize(
+void wxFrameOS2::DoGetSize(
   int*                              pWidth
 , int*                              pHeight
 ) const
@@ -330,9 +334,9 @@ void wxFrame::DoGetSize(
     ::WinQueryWindowRect(m_hFrame, &vRect);
     *pWidth = vRect.xRight - vRect.xLeft;
     *pHeight = vRect.yTop - vRect.yBottom;
-} // end of wxFrame::DoGetSize
+} // end of wxFrameOS2::DoGetSize
 
-void wxFrame::DoGetPosition(
+void wxFrameOS2::DoGetPosition(
   int*                              pX
 , int*                              pY
 ) const
@@ -344,21 +348,21 @@ void wxFrame::DoGetPosition(
 
     *pX = vRect.xRight - vRect.xLeft;
     *pY = vRect.yTop - vRect.yBottom;
-} // end of wxFrame::DoGetPosition
+} // end of wxFrameOS2::DoGetPosition
 
 // ----------------------------------------------------------------------------
 // variations around ::ShowWindow()
 // ----------------------------------------------------------------------------
 
-void wxFrame::DoShowWindow(
+void wxFrameOS2::DoShowWindow(
   int                               bShowCmd
 )
 {
     ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
     m_bIconized = bShowCmd == SWP_MINIMIZE;
-} // end of wxFrame::DoShowWindow
+} // end of wxFrameOS2::DoShowWindow
 
-bool wxFrame::Show(
+bool wxFrameOS2::Show(
   bool                              bShow
 )
 {
@@ -401,27 +405,27 @@ bool wxFrame::Show(
         }
     }
     return TRUE;
-} // end of wxFrame::Show
+} // end of wxFrameOS2::Show
 
-void wxFrame::Iconize(
+void wxFrameOS2::Iconize(
   bool                              bIconize
 )
 {
     DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
-} // end of wxFrame::Iconize
+} // end of wxFrameOS2::Iconize
 
-void wxFrame::Maximize(
+void wxFrameOS2::Maximize(
   bool                              bMaximize)
 {
     DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);
-} // end of wxFrame::Maximize
+} // end of wxFrameOS2::Maximize
 
-void wxFrame::Restore()
+void wxFrameOS2::Restore()
 {
     DoShowWindow(SWP_RESTORE);
-} // end of wxFrame::Restore
+} // end of wxFrameOS2::Restore
 
-bool wxFrame::IsIconized() const
+bool wxFrameOS2::IsIconized() const
 {
     SWP                             vSwp;
 
@@ -432,19 +436,19 @@ bool wxFrame::IsIconized() const
     else
         ((wxFrame*)this)->m_bIconized = FALSE;
     return m_bIconized;
-} // end of wxFrame::IsIconized
+} // end of wxFrameOS2::IsIconized
 
 // Is it maximized?
-bool wxFrame::IsMaximized() const
+bool wxFrameOS2::IsMaximized() const
 {
     SWP                             vSwp;
     bool                            bIconic;
 
     ::WinQueryWindowPos(m_hFrame, &vSwp);
     return (vSwp.fl & SWP_MAXIMIZE);
-} // end of wxFrame::IsMaximized
+} // end of wxFrameOS2::IsMaximized
 
-void wxFrame::SetIcon(
+void wxFrameOS2::SetIcon(
   const wxIcon&                     rIcon
 )
 {
@@ -463,10 +467,10 @@ void wxFrame::SetIcon(
                      ,(MPARAM)0
                     );
     }
-} // end of wxFrame::SetIcon
+} // end of wxFrameOS2::SetIcon
 
 #if wxUSE_STATUSBAR
-wxStatusBar* wxFrame::OnCreateStatusBar(
+wxStatusBar* wxFrameOS2::OnCreateStatusBar(
   int                               nNumber
 , long                              lulStyle
 , wxWindowID                        vId
@@ -501,9 +505,9 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
         ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
 
     return pStatusBar;
-} // end of wxFrame::OnCreateStatusBar
+} // end of wxFrameOS2::OnCreateStatusBar
 
-void wxFrame::PositionStatusBar()
+void wxFrameOS2::PositionStatusBar()
 {
     SWP                             vSwp;
     ERRORID                         vError;
@@ -548,19 +552,19 @@ void wxFrame::PositionStatusBar()
             return;
         }
     }
-} // end of wxFrame::PositionStatusBar
+} // end of wxFrameOS2::PositionStatusBar
 #endif // wxUSE_STATUSBAR
 
-void wxFrame::DetachMenuBar()
+void wxFrameOS2::DetachMenuBar()
 {
     if (m_frameMenuBar)
     {
         m_frameMenuBar->Detach();
         m_frameMenuBar = NULL;
     }
-} // end of wxFrame::DetachMenuBar
+} // end of wxFrameOS2::DetachMenuBar
 
-void wxFrame::SetMenuBar(
+void wxFrameOS2::SetMenuBar(
   wxMenuBar*                        pMenuBar
 )
 {
@@ -609,11 +613,11 @@ void wxFrame::SetMenuBar(
         }
         InternalSetMenuBar();
         m_frameMenuBar = pMenuBar;
-        pMenuBar->Attach(this);
+        pMenuBar->Attach((wxFrame*)this);
     }
-} // end of wxFrame::SetMenuBar
+} // end of wxFrameOS2::SetMenuBar
 
-void wxFrame::InternalSetMenuBar()
+void wxFrameOS2::InternalSetMenuBar()
 {
     ERRORID                         vError;
     wxString                        sError;
@@ -634,12 +638,12 @@ void wxFrame::InternalSetMenuBar()
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }
     ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
-} // end of wxFrame::InternalSetMenuBar
+} // end of wxFrameOS2::InternalSetMenuBar
 
 //
 // Responds to colour changes, and passes event on to children
 //
-void wxFrame::OnSysColourChanged(
+void wxFrameOS2::OnSysColourChanged(
   wxSysColourChangedEvent&          rEvent
 )
 {
@@ -660,10 +664,10 @@ void wxFrame::OnSysColourChanged(
     // Propagate the event to the non-top-level children
     //
     wxWindow::OnSysColourChanged(rEvent);
-} // end of wxFrame::OnSysColourChanged
+} // end of wxFrameOS2::OnSysColourChanged
 
 // Pass TRUE to show full screen, FALSE to restore.
-bool wxFrame::ShowFullScreen(
+bool wxFrameOS2::ShowFullScreen(
   bool                              bShow
 , long                              lStyle
 )
@@ -850,12 +854,12 @@ bool wxFrame::ShowFullScreen(
                          );
         return TRUE;
     }
-} // end of wxFrame::ShowFullScreen
+} // end of wxFrameOS2::ShowFullScreen
 
 //
 // Frame window
 //
-bool wxFrame::OS2Create(
+bool wxFrameOS2::OS2Create(
   int                               nId
 , wxWindow*                         pParent
 , const wxChar*                     zWclass
@@ -1044,13 +1048,13 @@ bool wxFrame::OS2Create(
         return FALSE;
     }
     return TRUE;
-} // end of wxFrame::OS2Create
+} // end of wxFrameOS2::OS2Create
 
 //
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 //
-void wxFrame::OnActivate(
+void wxFrameOS2::OnActivate(
   wxActivateEvent&                  rEvent
 )
 {
@@ -1101,7 +1105,7 @@ void wxFrame::OnActivate(
             }
         }
     }
-} // end of wxFrame::OnActivate
+} // end of wxFrameOS2::OnActivate
 
 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
@@ -1110,7 +1114,7 @@ void wxFrame::OnActivate(
 // ----------------------------------------------------------------------------
 
 // Checks if there is a toolbar, and returns the first free client position
-wxPoint wxFrame::GetClientAreaOrigin() const
+wxPoint wxFrameOS2::GetClientAreaOrigin() const
 {
     wxPoint                         vPoint(0, 0);
 
@@ -1136,7 +1140,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     }
 #endif //wxUSE_TOOLBAR
     return vPoint;
-} // end of wxFrame::GetClientAreaOrigin
+} // end of wxFrameOS2::GetClientAreaOrigin
 
 // ----------------------------------------------------------------------------
 // tool/status bar stuff
@@ -1144,7 +1148,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
 
 #if wxUSE_TOOLBAR
 
-wxToolBar* wxFrame::CreateToolBar(
+wxToolBar* wxFrameOS2::CreateToolBar(
   long                              lStyle
 , wxWindowID                        vId
 , const wxString&                   rName
@@ -1158,9 +1162,9 @@ wxToolBar* wxFrame::CreateToolBar(
         PositionToolBar();
     }
     return m_frameToolBar;
-} // end of wxFrame::CreateToolBar
+} // end of wxFrameOS2::CreateToolBar
 
-void wxFrame::PositionToolBar()
+void wxFrameOS2::PositionToolBar()
 {
     HWND                            hWndClient;
     RECTL                           vRect;
@@ -1209,7 +1213,7 @@ void wxFrame::PositionToolBar()
                               ,wxSIZE_NO_ADJUSTMENTS
                              );
     }
-} // end of wxFrame::PositionToolBar
+} // end of wxFrameOS2::PositionToolBar
 #endif // wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
@@ -1221,7 +1225,7 @@ void wxFrame::PositionToolBar()
 // Windows behaviour where child frames float independently of the parent one
 // on the desktop, but are iconized/restored with it
 //
-void wxFrame::IconizeChildFrames(
+void wxFrameOS2::IconizeChildFrames(
   bool                              bIconize
 )
 {
@@ -1236,7 +1240,7 @@ void wxFrame::IconizeChildFrames(
             ((wxFrame *)pWin)->Iconize(bIconize);
         }
     }
-} // end of wxFrame::IconizeChildFrames
+} // end of wxFrameOS2::IconizeChildFrames
 
 // ===========================================================================
 // message processing
@@ -1245,7 +1249,7 @@ void wxFrame::IconizeChildFrames(
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------
-bool wxFrame::OS2TranslateMessage(
+bool wxFrameOS2::OS2TranslateMessage(
   WXMSG*                            pMsg
 )
 {
@@ -1263,12 +1267,12 @@ bool wxFrame::OS2TranslateMessage(
 #else
     return FALSE;
 #endif //wxUSE_ACCEL
-} // end of wxFrame::OS2TranslateMessage
+} // end of wxFrameOS2::OS2TranslateMessage
 
 // ---------------------------------------------------------------------------
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------
-bool wxFrame::HandlePaint()
+bool wxFrameOS2::HandlePaint()
 {
     RECTL                           vRect;
 
@@ -1326,9 +1330,9 @@ bool wxFrame::HandlePaint()
         return TRUE;
     }
     return FALSE;
-} // end of wxFrame::HandlePaint
+} // end of wxFrameOS2::HandlePaint
 
-bool wxFrame::HandleSize(
+bool wxFrameOS2::HandleSize(
   int                               nX
 , int                               nY
 , WXUINT                            nId
@@ -1404,9 +1408,9 @@ bool wxFrame::HandleSize(
         bProcessed = GetEventHandler()->ProcessEvent(vEvent);
     }
     return bProcessed;
-} // end of wxFrame::HandleSize
+} // end of wxFrameOS2::HandleSize
 
-bool wxFrame::HandleCommand(
+bool wxFrameOS2::HandleCommand(
   WXWORD                            nId
 , WXWORD                            nCmd
 , WXHWND                            hControl
@@ -1447,9 +1451,9 @@ bool wxFrame::HandleCommand(
         }
     }
     return FALSE;
-} // end of wxFrame::HandleCommand
+} // end of wxFrameOS2::HandleCommand
 
-bool wxFrame::HandleMenuSelect(
+bool wxFrameOS2::HandleMenuSelect(
   WXWORD                            nItem
 , WXWORD                            nFlags
 , WXHMENU                           hMenu
@@ -1471,7 +1475,7 @@ bool wxFrame::HandleMenuSelect(
         }
     }
     return TRUE;
-} // end of wxFrame::HandleMenuSelect
+} // end of wxFrameOS2::HandleMenuSelect
 
 // ---------------------------------------------------------------------------
 // Main Frame window proc
@@ -1607,7 +1611,7 @@ MRESULT EXPENTRY wxFrameWndProc(
     return rc;
 } // end of wxFrameWndProc
 
-MRESULT wxFrame::OS2WindowProc(
+MRESULT wxFrameOS2::OS2WindowProc(
   WXUINT                            uMessage
 , WXWPARAM                          wParam
 , WXLPARAM                          lParam
@@ -1717,14 +1721,14 @@ MRESULT wxFrame::OS2WindowProc(
                                       ,lParam
                                      );
     return (MRESULT)mRc;
-} // wxFrame::OS2WindowProc
+} // wxFrameOS2::OS2WindowProc
 
-void wxFrame::SetClient(WXHWND c_Hwnd)
+void wxFrameOS2::SetClient(WXHWND c_Hwnd)
 {
    // Duh...nothing to do under OS/2
 }
 
-void wxFrame::SetClient(
+void wxFrameOS2::SetClient(
   wxWindow*                         pWindow
 )
 {
@@ -1774,7 +1778,7 @@ void wxFrame::SetClient(
     }
 }
 
-wxWindow* wxFrame::GetClient()
+wxWindow* wxFrameOS2::GetClient()
 {
     return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
 }
diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index ec9bfbda11..516ab66b2e 100644
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -502,9 +502,9 @@ void wxListBox::SetString(int N, const wxString& s)
 
     void *oldData = NULL;
     wxClientData *oldObjData = NULL;
-    if ( m_clientDataItemsType == ClientData_Void )
+    if ( m_clientDataItemsType == wxClientData_Void )
         oldData = GetClientData(N);
-    else if ( m_clientDataItemsType == ClientData_Object )
+    else if ( m_clientDataItemsType == wxClientData_Object )
         oldObjData = GetClientObject(N);
 // TODO:
 /*
diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 8e938b9b24..fbd85763b8 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -124,7 +124,8 @@ GENERICOBJS= \
   ..\generic\$D\propform.obj \
   ..\generic\$D\proplist.obj \
   ..\generic\$D\sashwin.obj \
-  ..\generic\$D\scrolwin.obj \
+  ..\generic\$D\scrlwing.obj \
+  ..\generic\$D\spinctlg.obj \
   ..\generic\$D\splitter.obj \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \
@@ -169,7 +170,8 @@ GENLIBOBJS= \
   propform.obj \
   proplist.obj \
   sashwin.obj \
-  scrolwin.obj \
+  scrlwing.obj \
+  spinctlg.obj \
   splitter.obj \
   statusbr.obj \
   tabg.obj \
@@ -192,6 +194,7 @@ COMMONOBJS = \
   ..\common\$D\clipcmn.obj \
   ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
+  ..\common\$D\cmdproc.obj \
   ..\common\$D\config.obj \
   ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
@@ -230,6 +233,7 @@ COMMONOBJS = \
   ..\common\$D\fs_mem.obj \
   ..\common\$D\fs_zip.obj \
   ..\common\$D\ftp.obj \
+  ..\common\$D\gaugecmn.obj \
   ..\common\$D\gdicmn.obj \
   ..\common\$D\geometry.obj \
   ..\common\$D\gifdecod.obj \
@@ -259,6 +263,7 @@ COMMONOBJS = \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \
+  ..\common\$D\nbkbase.obj \
   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \
 !if "$(WXMAKINGDLL)" != "1"
@@ -266,10 +271,12 @@ COMMONOBJS = \
   ..\common\$D\odbc.obj \
 !endif
   ..\common\$D\paper.obj \
+  ..\common\$D\popupcmn.obj \
   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \
   ..\common\$D\protocol.obj \
   ..\common\$D\quantize.obj \
+  ..\common\$D\radiocmn.obj \
   ..\common\$D\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \
@@ -310,6 +317,7 @@ COMLIBOBJS1 = \
   clipcmn.obj \
   cmdline.obj \
   cmndata.obj \
+  cmdproc.obj \
   config.obj \
   cshelp.obj \
   ctrlcmn.obj \
@@ -345,12 +353,13 @@ COMLIBOBJS1 = \
   fs_mem.obj \
   fs_zip.obj \
   ftp.obj \
+  gaugecmn.obj \
   gdicmn.obj \
-  geometry.obj \
-  gifdecod.obj \
-  hash.obj
+  geometry.obj
 
 COMLIBOBJS2 = \
+  gifdecod.obj \
+  hash.obj \
   helpbase.obj \
   http.obj \
   imagall.obj \
@@ -376,25 +385,28 @@ COMLIBOBJS2 = \
   mimecmn.obj \
   module.obj \
   mstream.obj \
+  nbkbase.obj \
   object.obj \
   objstrm.obj \
   odbc.obj \
   paper.obj \
+  popupcmn.obj \
   prntbase.obj \
   process.obj \
   protocol.obj \
   quantize.obj \
+  radiocmn.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
-  sckipc.obj \
+  sckipc.obj
+
+COMLIBOBJS3 = \
   sckstrm.obj \
   serbase.obj \
   sizer.obj \
   socket.obj \
-  strconv.obj
-
-COMLIBOBJS3 = \
+  strconv.obj \
   stream.obj \
   string.obj \
   tbarbase.obj \
@@ -654,6 +666,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\clipcmn.obj
   copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj
+  copy ..\common\$D\cmdproc.obj
   copy ..\common\$D\config.obj
   copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
@@ -689,12 +702,13 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fs_mem.obj
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
+  copy ..\common\$D\gaugecmn.obj
   copy ..\common\$D\gdicmn.obj
   copy ..\common\$D\geometry.obj
-  copy ..\common\$D\gifdecod.obj
-  copy ..\common\$D\hash.obj
 
 $(COMLIBOBJS2):
+  copy ..\common\$D\gifdecod.obj
+  copy ..\common\$D\hash.obj
   copy ..\common\$D\helpbase.obj
   copy ..\common\$D\http.obj
   copy ..\common\$D\imagall.obj
@@ -720,25 +734,28 @@ $(COMLIBOBJS2):
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\mstream.obj
+  copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\objstrm.obj
   copy ..\common\$D\odbc.obj
   copy ..\common\$D\paper.obj
+  copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\protocol.obj
   copy ..\common\$D\quantize.obj
+  copy ..\common\$D\radiocmn.obj
   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
   copy ..\common\$D\sckipc.obj
+
+$(COMLIBOBJS3):
   copy ..\common\$D\sckstrm.obj
   copy ..\common\$D\serbase.obj
   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
   copy ..\common\$D\strconv.obj
-
-$(COMLIBOBJS3):
   copy ..\common\$D\stream.obj
   copy ..\common\$D\string.obj
   copy ..\common\$D\tbarbase.obj
@@ -794,7 +811,8 @@ $(GENLIBOBJS):
   copy ..\generic\$D\propform.obj
   copy ..\generic\$D\proplist.obj
   copy ..\generic\$D\sashwin.obj
-  copy ..\generic\$D\scrolwin.obj
+  copy ..\generic\$D\scrlwing.obj
+  copy ..\generic\$D\spinctlg.obj
   copy ..\generic\$D\splitter.obj
   copy ..\generic\$D\statusbr.obj
   copy ..\generic\$D\tabg.obj
diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index e307253b91..e93d89adc4 100644
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -559,73 +559,21 @@ bool wxMenu::OS2Command(
 
     if (vId != (WXWORD)idMenuTitle)
     {
-        wxCommandEvent              vEvent(wxEVT_COMMAND_MENU_SELECTED);
-
-        vEvent.SetEventObject(this);
-        vEvent.SetId(vId);
-        vEvent.SetInt(vId);
-        ProcessCommand(vEvent);
+        SendEvent( vId
+                  ,(int)::WinSendMsg( GetHmenu()
+                                     ,MM_QUERYITEMATTR
+                                     ,(MPARAM)vId
+                                     ,(MPARAM)MIA_CHECKED
+                                    )
+                 );
     }
     return TRUE;
 } // end of wxMenu::OS2Command
 
-bool wxMenu::ProcessCommand(
-  wxCommandEvent&                   rEvent
-)
-{
-    bool                            bProcessed = FALSE;
-
-#if wxUSE_MENU_CALLBACK
-    //
-    // Try a callback
-    //
-    if (m_callback)
-    {
-        (void)(*(m_callback))(*this, rEvent);
-        bProcessed = TRUE;
-    }
-#endif // wxUSE_MENU_CALLBACK
-
-    //
-    // Try the menu's event handler
-    //
-    if (!bProcessed && GetEventHandler())
-    {
-        bProcessed = GetEventHandler()->ProcessEvent(rEvent);
-    }
-
-    //
-    // Try the window the menu was popped up from (and up through the
-    // hierarchy)
-    wxWindow*                       pWin = GetInvokingWindow();
-
-    if (!bProcessed && pWin)
-        bProcessed = pWin->GetEventHandler()->ProcessEvent(rEvent);
-    return bProcessed;
-} // end of wxMenu::ProcessCommand
-
 // ---------------------------------------------------------------------------
 // other
 // ---------------------------------------------------------------------------
 
-void wxMenu::Attach(
-  wxMenuBar*                        pMenubar
-)
-{
-    //
-    // Menu can be in at most one menubar because otherwise they would both
-    // delete the menu pointer
-    //
-    wxASSERT_MSG(!m_menuBar, wxT("menu belongs to 2 menubars, expect a crash"));
-    m_menuBar = pMenubar;
-} // end of
-
-void wxMenu::Detach()
-{
-    wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") );
-    m_menuBar = NULL;
-} // end of wxMenu::Detach
-
 wxWindow* wxMenu::GetWindow() const
 {
     if (m_invokingWindow != NULL)
diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 1d960c605b..16ea72e6a0 100644
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -71,7 +71,7 @@ static wxString TextToLabel(const wxString& rTitle)
                 pc++;
                 Title << wxT('&');
             }
-            else 
+            else
                 Title << wxT('~');
         }
 //         else if (*pc == wxT('/'))
@@ -208,18 +208,6 @@ wxString wxMenuItemBase::GetLabelFromText(
     return label;
 }
 
-// accelerators
-// ------------
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
-{
-    return wxGetAccelFromString(GetText());
-}
-
-#endif // wxUSE_ACCEL
-
 // change item state
 // -----------------
 
diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index efb99e30e4..5f4a9944cc 100644
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -248,6 +248,25 @@ void wxNotebook::SetTabSize(const wxSize& sz)
 // wxNotebook operations
 // ----------------------------------------------------------------------------
 
+void wxNotebook::SetPageSize(const wxSize& size)
+{
+    // transform the page size into the notebook size
+    RECT rc;
+    rc.xLeft = rc.yTop = 0;
+    rc.xRight = size.x;
+    rc.yBottom = size.y;
+
+//    TabCtrl_AdjustRect(GetHwnd(), TRUE, &rc);
+
+    // and now set it
+    SetSize(rc.xRight - rc.xLeft, rc.yBottom - rc.yTop);
+}
+
+void wxNotebook::SetPadding(const wxSize& padding)
+{
+//    TabCtrl_SetPadding(GetHwnd(), padding.x, padding.y);
+}
+
 // remove one page from the notebook
 bool wxNotebook::DeletePage(int nPage)
 {
diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 0392b1c87f..cf31c122fb 100644
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -51,6 +51,21 @@ static s_wndprocRadioBtn = NULL;
 // wxRadioBox
 // ---------------------------------------------------------------------------
 
+int wxRadioBox::GetCount() const
+{
+    return m_noItems;
+}
+
+int wxRadioBox::GetColumnCount() const
+{
+    return GetNumHor();
+}
+
+int wxRadioBox::GetRowCount() const
+{
+    return GetNumVer();
+}
+
 int wxRadioBox::GetNumVer() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
@@ -281,6 +296,14 @@ wxRadioBox::~wxRadioBox()
 
 }
 
+void wxRadioBox::SetString(int item, const wxString& label)
+{
+    wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );
+
+    m_radioWidth[item] = m_radioHeight[item] = -1;
+    ::WinSetWindowText((HWND)m_radioButtons[item], label.c_str());
+}
+
 wxString wxRadioBox::GetLabel(int item) const
 {
     wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") );
diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index a2989ec2e0..d0b290c997 100644
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -26,7 +26,6 @@
 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
 
 bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)
 {
@@ -148,6 +147,9 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
+// Not implemented
+#if 0
+
 bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
        const wxBitmap *bitmap,
            const wxPoint& pos,
@@ -218,3 +220,4 @@ bool wxBitmapRadioButton::GetValue(void) const
     return FALSE;
 }
 
+#endif
\ No newline at end of file
diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 26e94bc0cc..fbcfcc1029 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -149,11 +149,11 @@ static inline bool IsCtrlDown() { return (::WinGetKeyState(HWND_DESKTOP, VK_CTRL
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 
 BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
-    EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-    EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-    EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-    EVT_IDLE(wxWindow::OnIdle)
-    EVT_SET_FOCUS(wxWindow::OnSetFocus)
+    EVT_ERASE_BACKGROUND(wxWindowOS2::OnEraseBackground)
+    EVT_SYS_COLOUR_CHANGED(wxWindowOS2::OnSysColourChanged)
+    EVT_INIT_DIALOG(wxWindowOS2::OnInitDialog)
+    EVT_IDLE(wxWindowOS2::OnIdle)
+    EVT_SET_FOCUS(wxWindowOS2::OnSetFocus)
 END_EVENT_TABLE()
 
 // ===========================================================================
@@ -163,7 +163,7 @@ END_EVENT_TABLE()
 //
 // Find an item given the PM Window id
 //
-wxWindow* wxWindow::FindItem(
+wxWindow* wxWindowOS2::FindItem(
   long                              lId
 ) const
 {
@@ -196,12 +196,12 @@ wxWindow* wxWindow::FindItem(
         pCurrent = pCurrent->GetNext();
     }
     return(NULL);
-} // end of wxWindow::FindItem
+} // end of wxWindowOS2::FindItem
 
 //
 // Find an item given the PM Window handle
 //
-wxWindow* wxWindow::FindItemByHWND(
+wxWindow* wxWindowOS2::FindItemByHWND(
   WXHWND                            hWnd
 , bool                              bControlOnly
 ) const
@@ -235,12 +235,12 @@ wxWindow* wxWindow::FindItemByHWND(
         pCurrent = pCurrent->GetNext();
     }
     return(NULL);
-} // end of wxWindow::FindItemByHWND
+} // end of wxWindowOS2::FindItemByHWND
 
 //
 // Default command handler
 //
-bool wxWindow::OS2Command(
+bool wxWindowOS2::OS2Command(
   WXUINT                            WXUNUSED(uParam)
 , WXWORD                            WXUNUSED(uId)
 )
@@ -252,7 +252,7 @@ bool wxWindow::OS2Command(
 // constructors and such
 // ----------------------------------------------------------------------------
 
-void wxWindow::Init()
+void wxWindowOS2::Init()
 {
     //
     // Generic
@@ -296,12 +296,12 @@ void wxWindow::Init()
     m_lLastMouseY = -1;
     m_nLastMouseEvent = -1;
 #endif // wxUSE_MOUSEEVENT_HACK
-} // wxWindow::Init
+} // wxWindowOS2::Init
 
 //
 // Destructor
 //
-wxWindow::~wxWindow()
+wxWindowOS2::~wxWindowOS2()
 {
     m_isBeingDeleted = TRUE;
 
@@ -329,9 +329,9 @@ wxWindow::~wxWindow()
         //
         wxRemoveHandleAssociation(this);
     }
-} // end of wxWindow::~wxWindow
+} // end of wxWindowOS2::~wxWindowOS2
 
-bool wxWindow::Create(
+bool wxWindowOS2::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
 , const wxPoint&                    rPos
@@ -443,19 +443,19 @@ bool wxWindow::Create(
              );
 
     return(TRUE);
-} // end of wxWindow::Create
+} // end of wxWindowOS2::Create
 
 // ---------------------------------------------------------------------------
 // basic operations
 // ---------------------------------------------------------------------------
 
-void wxWindow::SetFocus()
+void wxWindowOS2::SetFocus()
 {
     HWND                            hWnd = GetHwnd();
 
     if (hWnd)
         ::WinSetFocus(HWND_DESKTOP, hWnd);
-} // end of wxWindow::SetFocus
+} // end of wxWindowOS2::SetFocus
 
 wxWindow* wxWindowBase::FindFocus()
 {
@@ -468,7 +468,7 @@ wxWindow* wxWindowBase::FindFocus()
     return NULL;
 } // wxWindowBase::FindFocus
 
-bool wxWindow::Enable(
+bool wxWindowOS2::Enable(
   bool                              bEnable
 )
 {
@@ -490,9 +490,9 @@ bool wxWindow::Enable(
         pNode = pNode->GetNext();
     }
     return(TRUE);
-} // end of wxWindow::Enable
+} // end of wxWindowOS2::Enable
 
-bool wxWindow::Show(
+bool wxWindowOS2::Show(
   bool                              bShow
 )
 {
@@ -508,31 +508,31 @@ bool wxWindow::Show(
         ::WinSetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE | SWP_ZORDER);
     }
     return(TRUE);
-} // end of wxWindow::Show
+} // end of wxWindowOS2::Show
 
-void wxWindow::Raise()
+void wxWindowOS2::Raise()
 {
     ::WinSetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER | SWP_ACTIVATE);
-} // end of wxWindow::Raise
+} // end of wxWindowOS2::Raise
 
-void wxWindow::Lower()
+void wxWindowOS2::Lower()
 {
     ::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER | SWP_DEACTIVATE);
-} // end of wxWindow::Lower
+} // end of wxWindowOS2::Lower
 
-void wxWindow::SetTitle(
+void wxWindowOS2::SetTitle(
   const wxString&                   rTitle
 )
 {
     ::WinSetWindowText(GetHwnd(), rTitle.c_str());
-} // end of wxWindow::SetTitle
+} // end of wxWindowOS2::SetTitle
 
-wxString wxWindow::GetTitle() const
+wxString wxWindowOS2::GetTitle() const
 {
     return wxGetWindowText(GetHWND());
-} // end of wxWindow::GetTitle
+} // end of wxWindowOS2::GetTitle
 
-void wxWindow::CaptureMouse()
+void wxWindowOS2::CaptureMouse()
 {
     HWND                            hWnd = GetHwnd();
 
@@ -541,18 +541,24 @@ void wxWindow::CaptureMouse()
         ::WinSetCapture(HWND_DESKTOP, hWnd);
         m_bWinCaptured = TRUE;
     }
-} // end of wxWindow::GetTitle
+} // end of wxWindowOS2::GetTitle
 
-void wxWindow::ReleaseMouse()
+void wxWindowOS2::ReleaseMouse()
 {
     if (m_bWinCaptured)
     {
         ::WinSetCapture(HWND_DESKTOP, NULLHANDLE);
         m_bWinCaptured = FALSE;
     }
-} // end of wxWindow::ReleaseMouse
+} // end of wxWindowOS2::ReleaseMouse
 
-bool wxWindow::SetFont(
+/* static */ wxWindow* wxWindowBase::GetCapture()
+{
+    HWND hwnd = ::WinQueryCapture(HWND_DESKTOP);
+    return hwnd ? wxFindWinFromHandle((WXHWND)hwnd) : (wxWindow *)NULL;
+} // end of wxWindowBase::GetCapture
+
+bool wxWindowOS2::SetFont(
   const wxFont&                     rFont
 )
 {
@@ -574,7 +580,7 @@ bool wxWindow::SetFont(
     return(TRUE);
 }
 
-bool wxWindow::SetCursor(
+bool wxWindowOS2::SetCursor(
   const wxCursor&                   rCursor
 ) // check if base implementation is OK
 {
@@ -605,9 +611,9 @@ bool wxWindow::SetCursor(
         ::WinSetPointer(HWND_DESKTOP, (HPOINTER)m_cursor.GetHCURSOR());
     }
     return TRUE;
-} // end of wxWindow::SetCursor
+} // end of wxWindowOS2::SetCursor
 
-void wxWindow::WarpPointer(
+void wxWindowOS2::WarpPointer(
   int                               nXPos
 , int                               nYPos
 )
@@ -621,10 +627,10 @@ void wxWindow::WarpPointer(
     nY += vRect.yBottom;
 
     ::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY));
-} // end of wxWindow::WarpPointer
+} // end of wxWindowOS2::WarpPointer
 
 #if WXWIN_COMPATIBILITY
-void wxWindow::OS2DeviceToLogical (float *x, float *y) const
+void wxWindowOS2::OS2DeviceToLogical (float *x, float *y) const
 {
 }
 #endif // WXWIN_COMPATIBILITY
@@ -634,7 +640,7 @@ void wxWindow::OS2DeviceToLogical (float *x, float *y) const
 // ---------------------------------------------------------------------------
 
 #if WXWIN_COMPATIBILITY
-void wxWindow::SetScrollRange(
+void wxWindowOS2::SetScrollRange(
   int                               nOrient
 , int                               nRange
 , bool                              bRefresh
@@ -658,9 +664,9 @@ void wxWindow::SetScrollRange(
         ::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
         ::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
     }
-} // end of wxWindow::SetScrollRange
+} // end of wxWindowOS2::SetScrollRange
 
-void wxWindow::SetScrollPage(
+void wxWindowOS2::SetScrollPage(
   int                               nOrient
 , int                               nPage
 , bool                              bRefresh
@@ -670,9 +676,9 @@ void wxWindow::SetScrollPage(
         m_nXThumbSize = nPage;
     else
         m_nYThumbSize = nPage;
-} // end of wxWindow::SetScrollPage
+} // end of wxWindowOS2::SetScrollPage
 
-int wxWindow::OldGetScrollRange(
+int wxWindowOS2::OldGetScrollRange(
   int                               nOrient
 ) const
 {
@@ -685,9 +691,9 @@ int wxWindow::OldGetScrollRange(
         return(SHORT2FROMMR(mRc));
      }
      return 0;
-} // end of wxWindow::OldGetScrollRange
+} // end of wxWindowOS2::OldGetScrollRange
 
-int  wxWindow::GetScrollPage(
+int  wxWindowOS2::GetScrollPage(
   int                               nOrient
 ) const
 {
@@ -695,10 +701,10 @@ int  wxWindow::GetScrollPage(
         return m_nXThumbSize;
     else
         return m_nYThumbSize;
-} // end of wxWindow::GetScrollPage
+} // end of wxWindowOS2::GetScrollPage
 #endif // WXWIN_COMPATIBILITY
 
-int  wxWindow::GetScrollPos(
+int  wxWindowOS2::GetScrollPos(
   int                               nOrient
 ) const
 {
@@ -706,9 +712,9 @@ int  wxWindow::GetScrollPos(
         return((int)::WinSendMsg(m_hWndScrollBarHorz, SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL));
     else
         return((int)::WinSendMsg(m_hWndScrollBarVert, SBM_QUERYPOS, (MPARAM)NULL, (MPARAM)NULL));
-} // end of wxWindow::GetScrollPos
+} // end of wxWindowOS2::GetScrollPos
 
-int wxWindow::GetScrollRange(
+int wxWindowOS2::GetScrollRange(
   int                               nOrient
 ) const
 {
@@ -719,9 +725,9 @@ int wxWindow::GetScrollRange(
     else
         mr = ::WinSendMsg(m_hWndScrollBarVert, SBM_QUERYRANGE, (MPARAM)NULL, (MPARAM)NULL);
     return((int)SHORT2FROMMR(mr));
-} // end of wxWindow::GetScrollRange
+} // end of wxWindowOS2::GetScrollRange
 
-int wxWindow::GetScrollThumb(
+int wxWindowOS2::GetScrollThumb(
   int                               nOrient
 ) const
 {
@@ -729,9 +735,9 @@ int wxWindow::GetScrollThumb(
         return m_nXThumbSize;
     else
         return m_nYThumbSize;
-} // end of wxWindow::GetScrollThumb
+} // end of wxWindowOS2::GetScrollThumb
 
-void wxWindow::SetScrollPos(
+void wxWindowOS2::SetScrollPos(
   int                               nOrient
 , int                               nPos
 , bool                              bRefresh
@@ -741,9 +747,9 @@ void wxWindow::SetScrollPos(
         ::WinSendMsg(m_hWndScrollBarHorz, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL);
     else
         ::WinSendMsg(m_hWndScrollBarVert, SBM_SETPOS, (MPARAM)nPos, (MPARAM)NULL);
-} // end of wxWindow::SetScrollPos(
+} // end of wxWindowOS2::SetScrollPos(
 
-void wxWindow::SetScrollbar(
+void wxWindowOS2::SetScrollbar(
   int                               nOrient
 , int                               nPos
 , int                               nThumbVisible
@@ -876,9 +882,9 @@ void wxWindow::SetScrollbar(
         }
         m_nYThumbSize = nThumbVisible;
     }
-} // end of wxWindow::SetScrollbar
+} // end of wxWindowOS2::SetScrollbar
 
-void wxWindow::ScrollWindow(
+void wxWindowOS2::ScrollWindow(
   int                               nDx
 , int                               nDy
 , const wxRect*                     pRect
@@ -965,13 +971,13 @@ void wxWindow::ScrollWindow(
         }
         pCurrent = pCurrent->GetNext();
     }
-} // end of wxWindow::ScrollWindow
+} // end of wxWindowOS2::ScrollWindow
 
 // ---------------------------------------------------------------------------
 // subclassing
 // ---------------------------------------------------------------------------
 
-void wxWindow::SubclassWin(
+void wxWindowOS2::SubclassWin(
   WXHWND                            hWnd
 )
 {
@@ -980,9 +986,9 @@ void wxWindow::SubclassWin(
     wxASSERT_MSG( !m_fnOldWndProc, wxT("subclassing window twice?") );
     wxCHECK_RET(::WinIsWindow(vHabmain, hwnd), wxT("invalid HWND in SubclassWin") );
     m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(hwnd, (PFNWP)wxWndProc);
-} // end of wxWindow::SubclassWin
+} // end of wxWindowOS2::SubclassWin
 
-void wxWindow::UnsubclassWin()
+void wxWindowOS2::UnsubclassWin()
 {
     //
     // Restore old Window proc
@@ -1001,12 +1007,12 @@ void wxWindow::UnsubclassWin()
             m_fnOldWndProc = 0;
         }
     }
-} // end of wxWindow::UnsubclassWin
+} // end of wxWindowOS2::UnsubclassWin
 
 //
 // Make a Windows extended style from the given wxWindows window style
 //
-WXDWORD wxWindow::MakeExtendedStyle(
+WXDWORD wxWindowOS2::MakeExtendedStyle(
   long                              lStyle
 , bool                              bEliminateBorders
 )
@@ -1032,14 +1038,14 @@ WXDWORD wxWindow::MakeExtendedStyle(
             dwStyle |= wxSTATIC_BORDER;
     }
     return dwStyle;
-} // end of wxWindow::MakeExtendedStyle
+} // end of wxWindowOS2::MakeExtendedStyle
 
 //
 // Determines whether simulated 3D effects or CTL3D should be used,
 // applying a default border style if required, and returning an extended
 // style to pass to OS2Create.
 //
-WXDWORD wxWindow::Determine3DEffects(
+WXDWORD wxWindowOS2::Determine3DEffects(
   WXDWORD                           dwDefaultBorderStyle
 , bool*                             pbWant3D
 ) const
@@ -1107,10 +1113,10 @@ WXDWORD wxWindow::Determine3DEffects(
         )
         dwStyle |= dwDefaultBorderStyle;
     return dwStyle;
-} // end of wxWindow::Determine3DEffects
+} // end of wxWindowOS2::Determine3DEffects
 
 #if WXWIN_COMPATIBILITY
-void wxWindow::OnCommand(
+void wxWindowOS2::OnCommand(
   wxWindow&                         rWin
 , wxCommandEvent&                   rEvent
 )
@@ -1121,9 +1127,9 @@ void wxWindow::OnCommand(
         m_parent->GetEventHandler()->OnCommand( rWin
                                                ,rEvent
                                               );
-} // end of wxWindow::OnCommand
+} // end of wxWindowOS2::OnCommand
 
-wxObject* wxWindow::GetChild(
+wxObject* wxWindowOS2::GetChild(
   int                               nNumber
 ) const
 {
@@ -1142,20 +1148,20 @@ wxObject* wxWindow::GetChild(
     }
     else
         return NULL;
-} // end of wxWindow::GetChild
+} // end of wxWindowOS2::GetChild
 
 #endif // WXWIN_COMPATIBILITY
 
 //
 // Setup background and foreground colours correctly
 //
-void wxWindow::SetupColours()
+void wxWindowOS2::SetupColours()
 {
     if ( GetParent() )
         SetBackgroundColour(GetParent()->GetBackgroundColour());
-} // end of wxWindow::SetupColours
+} // end of wxWindowOS2::SetupColours
 
-void wxWindow::OnIdle(
+void wxWindowOS2::OnIdle(
   wxIdleEvent&                      rEvent
 )
 {
@@ -1197,12 +1203,12 @@ void wxWindow::OnIdle(
         }
     }
     UpdateWindowUI();
-} // end of wxWindow::OnIdle
+} // end of wxWindowOS2::OnIdle
 
 //
 // Set this window to be the child of 'parent'.
 //
-bool wxWindow::Reparent(
+bool wxWindowOS2::Reparent(
   wxWindow*                         pParent
 )
 {
@@ -1214,9 +1220,9 @@ bool wxWindow::Reparent(
 
     ::WinSetParent(hWndChild, hWndParent, TRUE);
     return TRUE;
-} // end of wxWindow::Reparent
+} // end of wxWindowOS2::Reparent
 
-void wxWindow::Clear()
+void wxWindowOS2::Clear()
 {
     wxClientDC                      vDc(this);
     wxBrush                         vBrush( GetBackgroundColour()
@@ -1225,9 +1231,9 @@ void wxWindow::Clear()
 
     vDc.SetBackground(vBrush);
     vDc.Clear();
-} // end of wxWindow::Clear
+} // end of wxWindowOS2::Clear
 
-void wxWindow::Refresh(
+void wxWindowOS2::Refresh(
   bool                              bEraseBack
 , const wxRect*                     pRect
 )
@@ -1250,14 +1256,14 @@ void wxWindow::Refresh(
         else
             ::WinInvalidateRect(hWnd, NULL, bEraseBack);
     }
-} // end of wxWindow::Refresh
+} // end of wxWindowOS2::Refresh
 
 // ---------------------------------------------------------------------------
 // drag and drop
 // ---------------------------------------------------------------------------
 
 #if wxUSE_DRAG_AND_DROP
-void wxWindow::SetDropTarget(
+void wxWindowOS2::SetDropTarget(
   wxDropTarget*                     pDropTarget
 )
 {
@@ -1269,14 +1275,14 @@ void wxWindow::SetDropTarget(
     m_dropTarget = pDropTarget;
     if (m_dropTarget != 0)
         m_dropTarget->Register(m_hWnd);
-} // end of wxWindow::SetDropTarget
+} // end of wxWindowOS2::SetDropTarget
 #endif
 
 //
 // old style file-manager drag&drop support: we retain the old-style
 // DragAcceptFiles in parallel with SetDropTarget.
 //
-void wxWindow::DragAcceptFiles(
+void wxWindowOS2::DragAcceptFiles(
   bool                              bAccept
 )
 {
@@ -1284,7 +1290,7 @@ void wxWindow::DragAcceptFiles(
 
     if (hWnd && bAccept)
         ::DrgAcceptDroppedFiles(hWnd, NULL, NULL, DO_COPY, 0L);
-} // end of wxWindow::DragAcceptFiles
+} // end of wxWindowOS2::DragAcceptFiles
 
 // ----------------------------------------------------------------------------
 // tooltips
@@ -1292,7 +1298,7 @@ void wxWindow::DragAcceptFiles(
 
 #if wxUSE_TOOLTIPS
 
-void wxWindow::DoSetToolTip(
+void wxWindowOS2::DoSetToolTip(
   wxToolTip*                        pTooltip
 )
 {
@@ -1300,7 +1306,7 @@ void wxWindow::DoSetToolTip(
 
     if (m_tooltip)
         m_tooltip->SetWindow(this);
-} // end of wxWindow::DoSetToolTip
+} // end of wxWindowOS2::DoSetToolTip
 
 #endif // wxUSE_TOOLTIPS
 
@@ -1309,7 +1315,7 @@ void wxWindow::DoSetToolTip(
 // ---------------------------------------------------------------------------
 
 // Get total size
-void wxWindow::DoGetSize(
+void wxWindowOS2::DoGetSize(
   int*                              pWidth
 , int*                              pHeight
 ) const
@@ -1324,9 +1330,9 @@ void wxWindow::DoGetSize(
     if (pHeight )
         // OS/2 PM is backwards from windows
         *pHeight = vRect.yTop - vRect.yBottom;
-} // end of wxWindow::DoGetSize
+} // end of wxWindowOS2::DoGetSize
 
-void wxWindow::DoGetPosition(
+void wxWindowOS2::DoGetPosition(
   int*                              pX
 , int*                              pY
 ) const
@@ -1379,9 +1385,9 @@ void wxWindow::DoGetPosition(
         *pX = vPoint.x;
     if  (pY)
         *pY = vPoint.y;
-} // end of wxWindow::DoGetPosition
+} // end of wxWindowOS2::DoGetPosition
 
-void wxWindow::DoScreenToClient(
+void wxWindowOS2::DoScreenToClient(
   int*                              pX
 , int*                              pY
 ) const
@@ -1395,9 +1401,9 @@ void wxWindow::DoScreenToClient(
         *pX -= vSwp.x;
     if (pY)
         *pY -= vSwp.y;
-} // end of wxWindow::DoScreenToClient
+} // end of wxWindowOS2::DoScreenToClient
 
-void wxWindow::DoClientToScreen(
+void wxWindowOS2::DoClientToScreen(
   int*                              pX
 , int*                              pY
 ) const
@@ -1411,13 +1417,13 @@ void wxWindow::DoClientToScreen(
         *pX += vSwp.x;
     if (pY)
         *pY += vSwp.y;
-} // end of wxWindow::DoClientToScreen
+} // end of wxWindowOS2::DoClientToScreen
 
 //
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 // Must be a frame type window
 //
-void wxWindow::DoGetClientSize(
+void wxWindowOS2::DoGetClientSize(
   int*                              pWidth
 , int*                              pHeight
 ) const
@@ -1439,9 +1445,9 @@ void wxWindow::DoGetClientSize(
         *pWidth  = vRect.xRight;
     if (pHeight)
         *pHeight = vRect.yTop;
-} // end of wxWindow::DoGetClientSize
+} // end of wxWindowOS2::DoGetClientSize
 
-void wxWindow::DoMoveWindow(
+void wxWindowOS2::DoMoveWindow(
   int                               nX
 , int                               nY
 , int                               nWidth
@@ -1470,7 +1476,7 @@ void wxWindow::DoMoveWindow(
     {
         wxLogLastError("MoveWindow");
     }
-} // end of wxWindow::DoMoveWindow
+} // end of wxWindowOS2::DoMoveWindow
 
 //
 // Set the size of the window: if the dimensions are positive, just use them,
@@ -1482,7 +1488,7 @@ void wxWindow::DoMoveWindow(
 // the width/height to best suit our contents, otherwise we reuse the current
 // width/height
 //
-void wxWindow::DoSetSize(
+void wxWindowOS2::DoSetSize(
   int                               nX
 , int                               nY
 , int                               nWidth
@@ -1566,9 +1572,9 @@ void wxWindow::DoSetSize(
                  ,nWidth
                  ,nHeight
                 );
-} // end of wxWindow::DoSetSize
+} // end of wxWindowOS2::DoSetSize
 
-void wxWindow::DoSetClientSize(
+void wxWindowOS2::DoSetClientSize(
   int                               nWidth
 , int                               nHeight
 )
@@ -1625,14 +1631,14 @@ void wxWindow::DoSetClientSize(
 
     vEvent.SetEventObject(this);
     GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::DoSetClientSize
+} // end of wxWindowOS2::DoSetClientSize
 
-wxPoint wxWindow::GetClientAreaOrigin() const
+wxPoint wxWindowOS2::GetClientAreaOrigin() const
 {
     return wxPoint(0, 0);
-} // end of wxWindow::GetClientAreaOrigin
+} // end of wxWindowOS2::GetClientAreaOrigin
 
-void wxWindow::AdjustForParentClientOrigin(
+void wxWindowOS2::AdjustForParentClientOrigin(
   int&                              rX
 , int&                              rY
 , int                               nSizeFlags
@@ -1653,13 +1659,13 @@ void wxWindow::AdjustForParentClientOrigin(
             rY += vPoint.y;
         }
     }
-} // end of wxWindow::AdjustForParentClientOrigin
+} // end of wxWindowOS2::AdjustForParentClientOrigin
 
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
 
-int wxWindow::GetCharHeight() const
+int wxWindowOS2::GetCharHeight() const
 {
     HPS                             hPs;
     FONTMETRICS                     vFontMetrics;
@@ -1674,9 +1680,9 @@ int wxWindow::GetCharHeight() const
     }
     ::WinReleasePS(hPs);
     return(vFontMetrics.lMaxAscender + vFontMetrics.lMaxDescender);
-} // end of wxWindow::GetCharHeight
+} // end of wxWindowOS2::GetCharHeight
 
-int wxWindow::GetCharWidth() const
+int wxWindowOS2::GetCharWidth() const
 {
     HPS                             hPs;
     FONTMETRICS                     vFontMetrics;
@@ -1690,9 +1696,9 @@ int wxWindow::GetCharWidth() const
     }
     ::WinReleasePS(hPs);
     return(vFontMetrics.lAveCharWidth);
-} // end of wxWindow::GetCharWidth
+} // end of wxWindowOS2::GetCharWidth
 
-void wxWindow::GetTextExtent(
+void wxWindowOS2::GetTextExtent(
   const wxString&                   rString
 , int*                              pX
 , int*                              pY
@@ -1749,7 +1755,7 @@ void wxWindow::GetTextExtent(
 // Caret manipulation
 // ---------------------------------------------------------------------------
 
-void wxWindow::CreateCaret(
+void wxWindowOS2::CreateCaret(
   int                               nWidth
 , int                               nHeight
 )
@@ -1758,30 +1764,30 @@ void wxWindow::CreateCaret(
                          ,nWidth
                          ,nHeight
                         ));
-} // end of wxWindow::CreateCaret
+} // end of wxWindowOS2::CreateCaret
 
-void wxWindow::CreateCaret(
+void wxWindowOS2::CreateCaret(
   const wxBitmap*                   pBitmap
 )
 {
     wxFAIL_MSG("not implemented");
-} // end of wxWindow::CreateCaret
+} // end of wxWindowOS2::CreateCaret
 
-void wxWindow::ShowCaret(
+void wxWindowOS2::ShowCaret(
   bool                              bShow
 )
 {
     wxCHECK_RET( m_caret, "no caret to show" );
 
     m_caret->Show(bShow);
-} // end of wxWindow::ShowCaret
+} // end of wxWindowOS2::ShowCaret
 
-void wxWindow::DestroyCaret()
+void wxWindowOS2::DestroyCaret()
 {
     SetCaret(NULL);
-} // end of wxWindow::DestroyCaret
+} // end of wxWindowOS2::DestroyCaret
 
-void wxWindow::SetCaretPos(
+void wxWindowOS2::SetCaretPos(
   int                               nX
 , int                               nY)
 {
@@ -1790,9 +1796,9 @@ void wxWindow::SetCaretPos(
     m_caret->Move( nX
                   ,nY
                  );
-} // end of wxWindow::SetCaretPos
+} // end of wxWindowOS2::SetCaretPos
 
-void wxWindow::GetCaretPos(
+void wxWindowOS2::GetCaretPos(
   int*                              pX
 , int*                              pY
 ) const
@@ -1802,7 +1808,7 @@ void wxWindow::GetCaretPos(
     m_caret->GetPosition( pX
                          ,pY
                         );
-} // end of wxWindow::GetCaretPos
+} // end of wxWindowOS2::GetCaretPos
 
 #endif //wxUSE_CARET
 
@@ -1830,7 +1836,7 @@ static void wxYieldForCommandsOnly()
     }
 }
 
-bool wxWindow::DoPopupMenu(
+bool wxWindowOS2::DoPopupMenu(
   wxMenu*                           pMenu
 , int                               nX
 , int                               nY
@@ -1868,13 +1874,13 @@ bool wxWindow::DoPopupMenu(
 
     pMenu->SetInvokingWindow(NULL);
     return TRUE;
-} // end of wxWindow::DoPopupMenu
+} // end of wxWindowOS2::DoPopupMenu
 
 // ===========================================================================
 // pre/post message processing
 // ===========================================================================
 
-MRESULT wxWindow::OS2DefWindowProc(
+MRESULT wxWindowOS2::OS2DefWindowProc(
   WXUINT                            uMsg
 , WXWPARAM                          wParam
 , WXLPARAM                          lParam
@@ -1884,9 +1890,9 @@ MRESULT wxWindow::OS2DefWindowProc(
         return (MRESULT)m_fnOldWndProc(GetHWND(), (ULONG)uMsg, (MPARAM)wParam, (MPARAM)lParam);
     else
         return ::WinDefWindowProc(GetHWND(), (ULONG)uMsg, (MPARAM)wParam, (MPARAM)lParam);
-} // end of wxWindow::OS2DefWindowProc
+} // end of wxWindowOS2::OS2DefWindowProc
 
-bool wxWindow::OS2ProcessMessage(
+bool wxWindowOS2::OS2ProcessMessage(
   WXMSG*                            pMsg
 )
 {
@@ -2072,9 +2078,9 @@ bool wxWindow::OS2ProcessMessage(
 #endif // wxUSE_TOOLTIPS
 
     return FALSE;
-} // end of wxWindow::OS2ProcessMessage
+} // end of wxWindowOS2::OS2ProcessMessage
 
-bool wxWindow::OS2TranslateMessage(
+bool wxWindowOS2::OS2TranslateMessage(
   WXMSG*                            pMsg
 )
 {
@@ -2083,13 +2089,13 @@ bool wxWindow::OS2TranslateMessage(
 #else
   return FALSE;
 #endif //wxUSE_ACCEL
-} // end of wxWindow::OS2TranslateMessage
+} // end of wxWindowOS2::OS2TranslateMessage
 
 // ---------------------------------------------------------------------------
 // message params unpackers
 // ---------------------------------------------------------------------------
 
-void wxWindow::UnpackCommand(
+void wxWindowOS2::UnpackCommand(
   WXWPARAM                          wParam
 , WXLPARAM                          lParam
 , WORD*                             pId
@@ -2100,9 +2106,9 @@ void wxWindow::UnpackCommand(
     *pId = LOWORD(wParam);
     *phWnd = NULL;  // or may be GetHWND() ?
     *pCmd = LOWORD(lParam);
-} // end of wxWindow::UnpackCommand
+} // end of wxWindowOS2::UnpackCommand
 
-void wxWindow::UnpackActivate(
+void wxWindowOS2::UnpackActivate(
   WXWPARAM                          wParam
 , WXLPARAM                          lParam
 , WXWORD*                           pState
@@ -2111,9 +2117,9 @@ void wxWindow::UnpackActivate(
 {
     *pState     = LOWORD(wParam);
     *phWnd      = (WXHWND)lParam;
-} // end of wxWindow::UnpackActivate
+} // end of wxWindowOS2::UnpackActivate
 
-void wxWindow::UnpackScroll(
+void wxWindowOS2::UnpackScroll(
   WXWPARAM                          wParam
 , WXLPARAM                          lParam
 , WXWORD*                           pCode
@@ -2133,9 +2139,9 @@ void wxWindow::UnpackScroll(
 
     *pPos  = SHORT1FROMMP(lParam);
     *pCode = SHORT2FROMMP(lParam);
-} // end of wxWindow::UnpackScroll
+} // end of wxWindowOS2::UnpackScroll
 
-void wxWindow::UnpackMenuSelect(
+void wxWindowOS2::UnpackMenuSelect(
   WXWPARAM                          wParam
 , WXLPARAM                          lParam
 , WXWORD*                           pItem
@@ -2146,7 +2152,7 @@ void wxWindow::UnpackMenuSelect(
     *pItem = (WXWORD)LOWORD(wParam);
     *pFlags = HIWORD(wParam);
     *phMenu = (WXHMENU)lParam;
-} // end of wxWindow::UnpackMenuSelect
+} // end of wxWindowOS2::UnpackMenuSelect
 
 // ---------------------------------------------------------------------------
 // Main wxWindows window proc and the window proc for wxWindow
@@ -2217,7 +2223,7 @@ MRESULT EXPENTRY wxWndProc(
 // We will add (or delete) messages we need to handle at this default
 // level as we go
 //
-MRESULT wxWindow::OS2WindowProc(
+MRESULT wxWindowOS2::OS2WindowProc(
   WXUINT                            uMsg
 , WXWPARAM                          wParam
 , WXLPARAM                          lParam
@@ -2579,7 +2585,7 @@ MRESULT wxWindow::OS2WindowProc(
             mResult = OS2DefWindowProc(uMsg, wParam, lParam);
     }
     return mResult;
-} // end of wxWindow::OS2WindowProc
+} // end of wxWindowOS2::OS2WindowProc
 
 //
 // Dialog window proc
@@ -2661,11 +2667,11 @@ void wxRemoveHandleAssociation(
 // Default destroyer - override if you destroy it in some other way
 // (e.g. with MDI child windows)
 //
-void wxWindow::OS2DestroyWindow()
+void wxWindowOS2::OS2DestroyWindow()
 {
 }
 
-void wxWindow::OS2DetachWindowMenu()
+void wxWindowOS2::OS2DetachWindowMenu()
 {
     if (m_hMenu)
     {
@@ -2695,9 +2701,9 @@ void wxWindow::OS2DetachWindowMenu()
             }
         }
     }
-} // end of wxWindow::OS2DetachWindowMenu
+} // end of wxWindowOS2::OS2DetachWindowMenu
 
-bool wxWindow::OS2Create(
+bool wxWindowOS2::OS2Create(
   WXHWND                            hParent
 , PSZ                               zClass
 , const wxChar*                     zTitle
@@ -2833,7 +2839,7 @@ bool wxWindow::OS2Create(
         SubclassWin(GetHWND());
     }
     return TRUE;
-} // end of wxWindow::OS2Create
+} // end of wxWindowOS2::OS2Create
 
 // ===========================================================================
 // OS2 PM message handlers
@@ -2843,7 +2849,7 @@ bool wxWindow::OS2Create(
 // window creation/destruction
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleCreate(
+bool wxWindowOS2::HandleCreate(
   WXLPCREATESTRUCT                  vCs
 , bool*                             pbMayCreate
 )
@@ -2853,9 +2859,9 @@ bool wxWindow::HandleCreate(
     (void)GetEventHandler()->ProcessEvent(vEvent);
     *pbMayCreate = TRUE;
     return TRUE;
-} // end of wxWindow::HandleCreate
+} // end of wxWindowOS2::HandleCreate
 
-bool wxWindow::HandleDestroy()
+bool wxWindowOS2::HandleDestroy()
 {
     wxWindowDestroyEvent            vEvent(this);
 
@@ -2877,12 +2883,12 @@ bool wxWindow::HandleDestroy()
     // WM_DESTROY handled
     //
     return TRUE;
-} // end of wxWindow::HandleDestroy
+} // end of wxWindowOS2::HandleDestroy
 
 // ---------------------------------------------------------------------------
 // activation/focus
 // ---------------------------------------------------------------------------
-void wxWindow::OnSetFocus(
+void wxWindowOS2::OnSetFocus(
   wxFocusEvent&                     rEvent
 )
 {
@@ -2913,9 +2919,9 @@ void wxWindow::OnSetFocus(
                GetClassInfo()->GetClassName(), GetHandle());
 
     rEvent.Skip();
-} // end of wxWindow::OnSetFocus
+} // end of wxWindowOS2::OnSetFocus
 
-bool wxWindow::HandleActivate(
+bool wxWindowOS2::HandleActivate(
   int                               nState
 , WXHWND                            WXUNUSED(hActivate)
 )
@@ -2926,9 +2932,9 @@ bool wxWindow::HandleActivate(
                                           );
     vEvent.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleActivate
+} // end of wxWindowOS2::HandleActivate
 
-bool wxWindow::HandleSetFocus(
+bool wxWindowOS2::HandleSetFocus(
   WXHWND                            WXUNUSED(hWnd)
 )
 {
@@ -2957,9 +2963,9 @@ bool wxWindow::HandleSetFocus(
 
     vEvent.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleSetFocus
+} // end of wxWindowOS2::HandleSetFocus
 
-bool wxWindow::HandleKillFocus(
+bool wxWindowOS2::HandleKillFocus(
   WXHWND                            WXUNUSED(hWnd)
 )
 {
@@ -2979,13 +2985,13 @@ bool wxWindow::HandleKillFocus(
 
     vEvent.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleKillFocus
+} // end of wxWindowOS2::HandleKillFocus
 
 // ---------------------------------------------------------------------------
 // miscellaneous
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleShow(
+bool wxWindowOS2::HandleShow(
   bool                              bShow
 , int                               nStatus
 )
@@ -2996,9 +3002,9 @@ bool wxWindow::HandleShow(
 
     vEvent.m_eventObject = this;
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleShow
+} // end of wxWindowOS2::HandleShow
 
-bool wxWindow::HandleInitDialog(
+bool wxWindowOS2::HandleInitDialog(
   WXHWND                            WXUNUSED(hWndFocus)
 )
 {
@@ -3006,15 +3012,15 @@ bool wxWindow::HandleInitDialog(
 
     vEvent.m_eventObject = this;
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleInitDialog
+} // end of wxWindowOS2::HandleInitDialog
 
-bool wxWindow::HandleEndDrag(WXWPARAM wParam)
+bool wxWindowOS2::HandleEndDrag(WXWPARAM wParam)
 {
    // TODO: We'll handle drag and drop later
     return FALSE;
 }
 
-bool wxWindow::HandleSetCursor(
+bool wxWindowOS2::HandleSetCursor(
   USHORT                            vId
 , WXHWND                            hPointer
 )
@@ -3025,12 +3031,12 @@ bool wxWindow::HandleSetCursor(
     //
     ::WinSetPointer(HWND_DESKTOP, (HPOINTER)hPointer);
     return TRUE;
-} // end of wxWindow::HandleSetCursor
+} // end of wxWindowOS2::HandleSetCursor
 
 // ---------------------------------------------------------------------------
 // owner drawn stuff
 // ---------------------------------------------------------------------------
-bool wxWindow::OS2OnDrawItem(
+bool wxWindowOS2::OS2OnDrawItem(
   int                               vId
 , WXDRAWITEMSTRUCT*                 pItemStruct
 )
@@ -3181,9 +3187,9 @@ bool wxWindow::OS2OnDrawItem(
     }
 #endif
     return FALSE;
-} // end of wxWindow::OS2OnDrawItem
+} // end of wxWindowOS2::OS2OnDrawItem
 
-bool wxWindow::OS2OnMeasureItem(
+bool wxWindowOS2::OS2OnMeasureItem(
   int                               lId
 , WXMEASUREITEMSTRUCT*              pItemStruct
 )
@@ -3230,15 +3236,15 @@ bool wxWindow::OS2OnMeasureItem(
 // colours and palettes
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleSysColorChange()
+bool wxWindowOS2::HandleSysColorChange()
 {
     wxSysColourChangedEvent         vEvent;
 
     vEvent.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleSysColorChange
+} // end of wxWindowOS2::HandleSysColorChange
 
-bool wxWindow::HandleCtlColor(
+bool wxWindowOS2::HandleCtlColor(
   WXHBRUSH*                         phBrush
 )
 {
@@ -3246,9 +3252,9 @@ bool wxWindow::HandleCtlColor(
     // Not much provided with message. So not sure I can do anything with it
     //
     return TRUE;
-} // end of wxWindow::HandleCtlColor
+} // end of wxWindowOS2::HandleCtlColor
 
-bool wxWindow::HandleWindowParams(
+bool wxWindowOS2::HandleWindowParams(
   PWNDPARAMS                        pWndParams
 , WXLPARAM                          lParam
 )
@@ -3258,7 +3264,7 @@ bool wxWindow::HandleWindowParams(
 }
 
 // Define for each class of dialog and control
-WXHBRUSH wxWindow::OnCtlColor(WXHDC hDC,
+WXHBRUSH wxWindowOS2::OnCtlColor(WXHDC hDC,
                               WXHWND hWnd,
                               WXUINT nCtlColor,
                               WXUINT message,
@@ -3268,7 +3274,7 @@ WXHBRUSH wxWindow::OnCtlColor(WXHDC hDC,
     return (WXHBRUSH)0;
 }
 
-bool wxWindow::HandlePaletteChanged()
+bool wxWindowOS2::HandlePaletteChanged()
 {
     // need to set this to something first
     WXHWND                          hWndPalChange = NULLHANDLE;
@@ -3279,9 +3285,9 @@ bool wxWindow::HandlePaletteChanged()
     vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
 
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandlePaletteChanged
+} // end of wxWindowOS2::HandlePaletteChanged
 
-bool wxWindow::HandlePresParamChanged(
+bool wxWindowOS2::HandlePresParamChanged(
   WXWPARAM                          wParam
 )
 {
@@ -3299,7 +3305,7 @@ bool wxWindow::HandlePresParamChanged(
 //
 // Responds to colour changes: passes event on to children.
 //
-void wxWindow::OnSysColourChanged(
+void wxWindowOS2::OnSysColourChanged(
   wxSysColourChangedEvent&          rEvent
 )
 {
@@ -3321,13 +3327,13 @@ void wxWindow::OnSysColourChanged(
         }
         pNode = pNode->Next();
     }
-} // end of wxWindow::OnSysColourChanged
+} // end of wxWindowOS2::OnSysColourChanged
 
 // ---------------------------------------------------------------------------
 // painting
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandlePaint()
+bool wxWindowOS2::HandlePaint()
 {
     HRGN                            hRgn = NULLHANDLE;
     wxPaintEvent                    vEvent;
@@ -3396,9 +3402,9 @@ bool wxWindow::HandlePaint()
         }
     }
     return (GetEventHandler()->ProcessEvent(vEvent));
-} // end of wxWindow::HandlePaint
+} // end of wxWindowOS2::HandlePaint
 
-bool wxWindow::HandleEraseBkgnd(
+bool wxWindowOS2::HandleEraseBkgnd(
   WXHDC                             hDC
 )
 {
@@ -3423,9 +3429,9 @@ bool wxWindow::HandleEraseBkgnd(
     vDC.EndDrawing();
     vDC.m_hPS = NULLHANDLE;
     return TRUE;
-} // end of wxWindow::HandleEraseBkgnd
+} // end of wxWindowOS2::HandleEraseBkgnd
 
-void wxWindow::OnEraseBackground(
+void wxWindowOS2::OnEraseBackground(
   wxEraseEvent&                     rEvent
 )
 {
@@ -3434,29 +3440,29 @@ void wxWindow::OnEraseBackground(
 
     ::WinQueryWindowRect(GetHwnd(), &vRect);
     ::WinFillRect(hPS, &vRect,  m_backgroundColour.GetPixel());
-}  // end of wxWindow::OnEraseBackground
+}  // end of wxWindowOS2::OnEraseBackground
 
 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
 
-bool wxWindow::HandleMinimize()
+bool wxWindowOS2::HandleMinimize()
 {
     wxIconizeEvent                  vEvent(m_windowId);
 
     vEvent.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleMinimize
+} // end of wxWindowOS2::HandleMinimize
 
-bool wxWindow::HandleMaximize()
+bool wxWindowOS2::HandleMaximize()
 {
     wxMaximizeEvent                 vEvent(m_windowId);
 
     vEvent.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleMaximize
+} // end of wxWindowOS2::HandleMaximize
 
-bool wxWindow::HandleMove(
+bool wxWindowOS2::HandleMove(
   int                               nX
 , int                               nY
 )
@@ -3469,9 +3475,9 @@ bool wxWindow::HandleMove(
 
     vEvent.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(vEvent);
-}  // end of wxWindow::HandleMove
+}  // end of wxWindowOS2::HandleMove
 
-bool wxWindow::HandleSize(
+bool wxWindowOS2::HandleSize(
   int                               nWidth
 , int                               nHeight
 , WXUINT                            WXUNUSED(nFlag)
@@ -3485,9 +3491,9 @@ bool wxWindow::HandleSize(
 
     vEvent.SetEventObject(this);
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleSize
+} // end of wxWindowOS2::HandleSize
 
-bool wxWindow::HandleGetMinMaxInfo(
+bool wxWindowOS2::HandleGetMinMaxInfo(
   PSWP                              pSwp
 )
 {
@@ -3512,12 +3518,12 @@ bool wxWindow::HandleGetMinMaxInfo(
             return FALSE;
     }
     return TRUE;
-} // end of wxWindow::HandleGetMinMaxInfo
+} // end of wxWindowOS2::HandleGetMinMaxInfo
 
 // ---------------------------------------------------------------------------
 // command messages
 // ---------------------------------------------------------------------------
-bool wxWindow::HandleCommand(
+bool wxWindowOS2::HandleCommand(
   WXWORD                            wId
 , WXWORD                            wCmd
 , WXHWND                            hControl
@@ -3543,9 +3549,9 @@ bool wxWindow::HandleCommand(
                                 ,wId
                                );
     return FALSE;
-} // end of wxWindow::HandleCommand
+} // end of wxWindowOS2::HandleCommand
 
-bool wxWindow::HandleSysCommand(
+bool wxWindowOS2::HandleSysCommand(
   WXWPARAM                          wParam
 , WXLPARAM                          lParam
 )
@@ -3562,13 +3568,13 @@ bool wxWindow::HandleSysCommand(
             return HandleMinimize();
     }
     return FALSE;
-} // end of wxWindow::HandleSysCommand
+} // end of wxWindowOS2::HandleSysCommand
 
 // ---------------------------------------------------------------------------
 // mouse events
 // ---------------------------------------------------------------------------
 
-void wxWindow::InitMouseEvent(
+void wxWindowOS2::InitMouseEvent(
   wxMouseEvent&                     rEvent
 , int                               nX
 , int                               nY
@@ -3590,9 +3596,9 @@ void wxWindow::InitMouseEvent(
     m_lastMouseY = nY;
     m_lastMouseEvent = rEvent.GetEventType();
 #endif // wxUSE_MOUSEEVENT_HACK
-} // end of wxWindow::InitMouseEvent
+} // end of wxWindowOS2::InitMouseEvent
 
-bool wxWindow::HandleMouseEvent(
+bool wxWindowOS2::HandleMouseEvent(
   WXUINT                            uMsg
 , int                               nX
 , int                               nY
@@ -3628,9 +3634,9 @@ bool wxWindow::HandleMouseEvent(
                   );
 
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::HandleMouseEvent
+} // end of wxWindowOS2::HandleMouseEvent
 
-bool wxWindow::HandleMouseMove(
+bool wxWindowOS2::HandleMouseMove(
   int                               nX
 , int                               nY
 , WXUINT                            uFlags
@@ -3658,7 +3664,7 @@ bool wxWindow::HandleMouseMove(
                             ,nY
                             ,uFlags
                            );
-} // end of wxWindow::HandleMouseMove
+} // end of wxWindowOS2::HandleMouseMove
 
 // ---------------------------------------------------------------------------
 // keyboard handling
@@ -3668,7 +3674,7 @@ bool wxWindow::HandleMouseMove(
 // Create the key event of the given type for the given key - used by
 // HandleChar and HandleKeyDown/Up
 //
-wxKeyEvent wxWindow::CreateKeyEvent(
+wxKeyEvent wxWindowOS2::CreateKeyEvent(
   wxEventType                       eType
 , int                               nId
 , WXLPARAM                          lParam
@@ -3703,13 +3709,13 @@ wxKeyEvent wxWindow::CreateKeyEvent(
     vEvent.m_y = vPoint.y;
 
     return vEvent;
-} // end of wxWindow::CreateKeyEvent
+} // end of wxWindowOS2::CreateKeyEvent
 
 //
 // isASCII is TRUE only when we're called from WM_CHAR handler and not from
 // WM_KEYDOWN one
 //
-bool wxWindow::HandleChar(
+bool wxWindowOS2::HandleChar(
   WXWORD                            wParam
 , WXLPARAM                          lParam
 , bool                              isASCII
@@ -3773,7 +3779,7 @@ bool wxWindow::HandleChar(
     return FALSE;
 }
 
-bool wxWindow::HandleKeyDown(
+bool wxWindowOS2::HandleKeyDown(
   WXWORD                            wParam
 , WXLPARAM                          lParam
 )
@@ -3801,9 +3807,9 @@ bool wxWindow::HandleKeyDown(
         }
     }
     return FALSE;
-} // end of wxWindow::HandleKeyDown
+} // end of wxWindowOS2::HandleKeyDown
 
-bool wxWindow::HandleKeyUp(
+bool wxWindowOS2::HandleKeyUp(
   WXWORD                            wParam
 , WXLPARAM                          lParam
 )
@@ -3829,7 +3835,7 @@ bool wxWindow::HandleKeyUp(
             return TRUE;
     }
     return FALSE;
-} // end of wxWindow::HandleKeyUp
+} // end of wxWindowOS2::HandleKeyUp
 
 // ---------------------------------------------------------------------------
 // joystick
@@ -3839,7 +3845,7 @@ bool wxWindow::HandleKeyUp(
 // scrolling
 // ---------------------------------------------------------------------------
 
-bool wxWindow::OS2OnScroll(
+bool wxWindowOS2::OS2OnScroll(
   int                               nOrientation
 , WXWORD                            wParam
 , WXWORD                            wPos
@@ -3894,7 +3900,7 @@ bool wxWindow::OS2OnScroll(
             return FALSE;
     }
     return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxWindow::OS2OnScroll
+} // end of wxWindowOS2::OS2OnScroll
 
 // ===========================================================================
 // global functions
diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 66638bb673..820825ac17 100644
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,22 +4,29 @@ 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
   ;From object file:  ..\common\appcmn.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxAppBase::OnInitGui()
+      OnInitGui__9wxAppBaseFv
       __vft9wxAppBase8wxObject
       ;wxAppBase::OnExit()
       OnExit__9wxAppBaseFv
+      ;wxAppBase::wxAppBase()
+      __ct__9wxAppBaseFv
       ;wxAppBase::ProcessPendingEvents()
       ProcessPendingEvents__9wxAppBaseFv
+      ;wxAppBase::SetActive(unsigned long,wxWindow*)
+      SetActive__9wxAppBaseFUlP8wxWindow
   ;From object file:  ..\common\choiccmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxChoiceBase::SetStringSelection(const wxString&)
       SetStringSelection__12wxChoiceBaseFRC8wxString
       __vft12wxChoiceBase8wxObject
+      __vft12wxChoiceBase15wxItemContainer
       ;wxChoiceBase::Command(wxCommandEvent&)
       Command__12wxChoiceBaseFR14wxCommandEvent
   ;From object file:  ..\common\clipcmn.cpp
@@ -37,93 +44,6 @@ EXPORTS
       ;wxConstructorForwxClipboardModule()
       wxConstructorForwxClipboardModule__Fv
   ;From object file:  ..\common\cmdline.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxCmdLineParser::EnableLongOptions(unsigned long)
-      EnableLongOptions__15wxCmdLineParserFUl
-      ;wxArrayParams::Index(const wxCmdLineParam&,unsigned long) const
-      Index__13wxArrayParamsCFRC14wxCmdLineParamUl
-      ;wxCmdLineParser::Found(const wxString&,long*) const
-      Found__15wxCmdLineParserCFRC8wxStringPl
-      ;wxArrayParams::RemoveAt(unsigned int)
-      RemoveAt__13wxArrayParamsFUi
-      ;wxCmdLineParser::AddSwitch(const wxString&,const wxString&,const wxString&,int)
-      AddSwitch__15wxCmdLineParserFRC8wxStringN21i
-      ;wxArrayOptions::Add(const wxCmdLineOption&)
-      Add__14wxArrayOptionsFRC15wxCmdLineOption
-      ;wxCmdLineParser::Reset()
-      Reset__15wxCmdLineParserFv
-      ;wxCmdLineParser::SetCmdLine(int,char**)
-      SetCmdLine__15wxCmdLineParserFiPPc
-      ;wxArrayOptions::wxArrayOptions(const wxArrayOptions&)
-      __ct__14wxArrayOptionsFRC14wxArrayOptions
-      ;wxCmdLineParser::SetSwitchChars(const wxString&)
-      SetSwitchChars__15wxCmdLineParserFRC8wxString
-      ;wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc*)
-      SetDesc__15wxCmdLineParserFPC18wxCmdLineEntryDesc
-      ;wxCmdLineParser::Found(const wxString&,wxString*) const
-      Found__15wxCmdLineParserCFRC8wxStringP8wxString
-      ;wxCmdLineParserData::FindOptionByLongName(const wxString&)
-      FindOptionByLongName__19wxCmdLineParserDataFRC8wxString
-      ;wxArrayOptions::Index(const wxCmdLineOption&,unsigned long) const
-      Index__14wxArrayOptionsCFRC15wxCmdLineOptionUl
-      ;wxArrayOptions::RemoveAt(unsigned int)
-      RemoveAt__14wxArrayOptionsFUi
-      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int)
-      Insert__13wxArrayParamsFRC14wxCmdLineParamUi
-      ;wxCmdLineParserData::wxCmdLineParserData()
-      __ct__19wxCmdLineParserDataFv
-      ;wxCmdLineParser::SetCmdLine(const wxString&)
-      SetCmdLine__15wxCmdLineParserFRC8wxString
-      ;wxArrayParams::wxArrayParams(const wxArrayParams&)
-      __ct__13wxArrayParamsFRC13wxArrayParams
-      ;wxArrayOptions::operator=(const wxArrayOptions&)
-      __as__14wxArrayOptionsFRC14wxArrayOptions
-      ;wxCmdLineParserData::SetArguments(const wxString&)
-      SetArguments__19wxCmdLineParserDataFRC8wxString
-      ;wxArrayOptions::Insert(const wxCmdLineOption&,unsigned int)
-      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUi
-      ;wxArrayParams::Add(const wxCmdLineParam&)
-      Add__13wxArrayParamsFRC14wxCmdLineParam
-      ;wxArrayParams::DoEmpty()
-      DoEmpty__13wxArrayParamsFv
-      ;wxArrayOptions::~wxArrayOptions()
-      __dt__14wxArrayOptionsFv
-      ;wxCmdLineParser::Usage()
-      Usage__15wxCmdLineParserFv
-      ;wxCmdLineParser::Parse()
-      Parse__15wxCmdLineParserFv
-      ;wxCmdLineParserData::SetArguments(int,char**)
-      SetArguments__19wxCmdLineParserDataFiPPc
-      ;wxCmdLineParser::Found(const wxString&) const
-      Found__15wxCmdLineParserCFRC8wxString
-      ;wxCmdLineParser::AddParam(const wxString&,wxCmdLineParamType,int)
-      AddParam__15wxCmdLineParserFRC8wxString18wxCmdLineParamTypei
-      ;wxCmdLineParser::GetParam(unsigned int) const
-      GetParam__15wxCmdLineParserCFUi
-      ;wxCmdLineParser::Found(const wxString&,wxDateTime*) const
-      Found__15wxCmdLineParserCFRC8wxStringP10wxDateTime
-      ;wxCmdLineParser::Init()
-      Init__15wxCmdLineParserFv
-      ;wxCmdLineParser::~wxCmdLineParser()
-      __dt__15wxCmdLineParserFv
-      ;wxArrayParams::~wxArrayParams()
-      __dt__13wxArrayParamsFv
-      ;wxArrayParams::operator=(const wxArrayParams&)
-      __as__13wxArrayParamsFRC13wxArrayParams
-      ;wxCmdLineParser::AddOption(const wxString&,const wxString&,const wxString&,wxCmdLineParamType,int)
-      AddOption__15wxCmdLineParserFRC8wxStringN2118wxCmdLineParamTypei
-      ;wxArrayOptions::DoEmpty()
-      DoEmpty__14wxArrayOptionsFv
-      ;wxCmdLineParser::GetParamCount() const
-      GetParamCount__15wxCmdLineParserCFv
-      ;wxArrayOptions::DoCopy(const wxArrayOptions&)
-      DoCopy__14wxArrayOptionsFRC14wxArrayOptions
-      ;wxCmdLineParser::SetLogo(const wxString&)
-      SetLogo__15wxCmdLineParserFRC8wxString
-      ;wxCmdLineParserData::FindOption(const wxString&)
-      FindOption__19wxCmdLineParserDataFRC8wxString
-      ;wxArrayParams::DoCopy(const wxArrayParams&)
-      DoCopy__13wxArrayParamsFRC13wxArrayParams
   ;From object file:  ..\common\cmndata.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxColourData::GetCustomColour(int)
@@ -209,6 +129,46 @@ EXPORTS
       __ct__21wxPageSetupDialogDataFv
       ;wxPrintDialogData::wxPrintDialogData()
       __ct__17wxPrintDialogDataFv
+  ;From object file:  ..\common\cmdproc.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxCommandProcessor::UndoCommand(wxCommand&)
+      UndoCommand__18wxCommandProcessorFR9wxCommand
+      ;wxCommandProcessor::Store(wxCommand*)
+      Store__18wxCommandProcessorFP9wxCommand
+      ;wxCommandProcessor::wxCommandProcessor(int)
+      __ct__18wxCommandProcessorFi
+      ;wxConstructorForwxCommandProcessor()
+      wxConstructorForwxCommandProcessor__Fv
+      ;wxCommandProcessor::DoCommand(wxCommand&)
+      DoCommand__18wxCommandProcessorFR9wxCommand
+      ;wxCommand::sm_classwxCommand
+      sm_classwxCommand__9wxCommand
+      ;wxCommandProcessor::Undo()
+      Undo__18wxCommandProcessorFv
+      ;wxCommandProcessor::SetMenuStrings()
+      SetMenuStrings__18wxCommandProcessorFv
+      ;wxCommandProcessor::CanRedo() const
+      CanRedo__18wxCommandProcessorCFv
+      ;wxCommandProcessor::Submit(wxCommand*,unsigned long)
+      Submit__18wxCommandProcessorFP9wxCommandUl
+      __vft18wxCommandProcessor8wxObject
+      ;wxCommand::~wxCommand()
+      __dt__9wxCommandFv
+      ;wxCommandProcessor::sm_classwxCommandProcessor
+      sm_classwxCommandProcessor__18wxCommandProcessor
+      ;wxCommandProcessor::~wxCommandProcessor()
+      __dt__18wxCommandProcessorFv
+      ;wxCommandProcessor::Initialize()
+      Initialize__18wxCommandProcessorFv
+      ;wxCommandProcessor::CanUndo() const
+      CanUndo__18wxCommandProcessorCFv
+      ;wxCommand::wxCommand(unsigned long,const wxString&)
+      __ct__9wxCommandFUlRC8wxString
+      __vft9wxCommand8wxObject
+      ;wxCommandProcessor::Redo()
+      Redo__18wxCommandProcessorFv
+      ;wxCommandProcessor::ClearCommands()
+      ClearCommands__18wxCommandProcessorFv
   ;From object file:  ..\common\config.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConfigBase::Write(const wxString&,double)
@@ -332,24 +292,29 @@ EXPORTS
       ;wxControlBase::Command(wxCommandEvent&)
       Command__13wxControlBaseFR14wxCommandEvent
       __vft13wxControlBase8wxObject
+      __vft18wxStaticBitmapBase8wxObject
+      ;wxControlBase::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
+      Create__13wxControlBaseFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxControlBase::CreateControl(wxWindowBase*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       CreateControl__13wxControlBaseFP12wxWindowBaseiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxControlBase::InheritAttributes()
       InheritAttributes__13wxControlBaseFv
+      ;wxStaticBitmapBase::DoGetBestClientSize() const
+      DoGetBestClientSize__18wxStaticBitmapBaseCFv
       ;wxControlBase::InitCommandEvent(wxCommandEvent&) const
       InitCommandEvent__13wxControlBaseCFR14wxCommandEvent
   ;From object file:  ..\common\ctrlsub.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxControlWithItems::GetClientData(int) const
-      GetClientData__18wxControlWithItemsCFi
-      ;wxControlWithItems::SetClientObject(int,wxClientData*)
-      SetClientObject__18wxControlWithItemsFiP12wxClientData
-      ;wxControlWithItems::GetStringSelection() const
-      GetStringSelection__18wxControlWithItemsCFv
-      ;wxControlWithItems::SetClientData(int,void*)
-      SetClientData__18wxControlWithItemsFiPv
-      ;wxControlWithItems::GetClientObject(int) const
-      GetClientObject__18wxControlWithItemsCFi
+      ;wxItemContainer::GetClientData(int) const
+      GetClientData__15wxItemContainerCFi
+      ;wxItemContainer::GetClientObject(int) const
+      GetClientObject__15wxItemContainerCFi
+      ;wxItemContainer::SetClientData(int,void*)
+      SetClientData__15wxItemContainerFiPv
+      ;wxItemContainer::GetStringSelection() const
+      GetStringSelection__15wxItemContainerCFv
+      ;wxItemContainer::SetClientObject(int,wxClientData*)
+      SetClientObject__15wxItemContainerFiP12wxClientData
   ;From object file:  ..\common\datetime.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDateTime::wxDateTime(double)
@@ -730,10 +695,14 @@ EXPORTS
       DrawSpline__8wxDCBaseFiP7wxPoint
       wx_spline_point_list
       __vft8wxDCBase8wxObject
+      ;wxDCBase::DrawLabel(const wxString&,const wxBitmap&,const wxRect&,int,int,wxRect*)
+      DrawLabel__8wxDCBaseFRC8wxStringRC8wxBitmapRC6wxRectiT4P6wxRect
       ;wxDCBase::DoDrawSpline(wxList*)
       DoDrawSpline__8wxDCBaseFP6wxList
       ;wxDCBase::DrawLines(const wxList*,int,int)
       DrawLines__8wxDCBaseFPC6wxListiT2
+      ;wxDCBase::GetMultiLineTextExtent(const wxString&,int*,int*,int*,wxFont*)
+      GetMultiLineTextExtent__8wxDCBaseFRC8wxStringPiN22P6wxFont
       ;wx_quadratic_spline(double,double,double,double,double,double,double,double)
       wx_quadratic_spline__FdN71
       ;wxDCBase::DrawPolygon(const wxList*,int,int,int)
@@ -892,8 +861,8 @@ EXPORTS
       Close__6wxViewFUl
       ;wxView::Activate(unsigned long)
       Activate__6wxViewFUl
-      ;wxCommandProcessor::wxCommandProcessor(int)
-      __ct__18wxCommandProcessorFi
+      ;wxDocument::SaveObject(ostream&)
+      SaveObject__10wxDocumentFR7ostream
       ;wxDocParentFrame::sm_eventTable
       sm_eventTable__16wxDocParentFrame
       ;wxDocChildFrame::sm_eventTable
@@ -906,8 +875,6 @@ EXPORTS
       __ct__15wxDocChildFrameFP10wxDocumentP6wxViewP7wxFrameiRC8wxStringRC7wxPointRC6wxSizelT5
       ;wxFileHistory::Save(wxConfigBase&)
       Save__13wxFileHistoryFR12wxConfigBase
-      ;wxDocument::SaveObject(ostream&)
-      SaveObject__10wxDocumentFR7ostream
       ;wxDocManager::RemoveFileFromHistory(int)
       RemoveFileFromHistory__12wxDocManagerFi
       ;wxDocPrintout::OnBeginDocument(int,int)
@@ -916,8 +883,6 @@ EXPORTS
       FileHistoryLoad__12wxDocManagerFR12wxConfigBase
       ;wxConstructorForwxDocManager()
       wxConstructorForwxDocManager__Fv
-      ;wxConstructorForwxCommandProcessor()
-      wxConstructorForwxCommandProcessor__Fv
       ;wxDocManager::sm_docManager
       sm_docManager__12wxDocManager
       ;wxDocTemplate::~wxDocTemplate()
@@ -942,8 +907,6 @@ EXPORTS
       AddFileToHistory__12wxDocManagerFRC8wxString
       ;wxDocument::wxDocument(wxDocument*)
       __ct__10wxDocumentFP10wxDocument
-      ;wxCommand::sm_classwxCommand
-      sm_classwxCommand__9wxCommand
       __vft6wxView8wxObject
       __vft16wxDocParentFrame8wxObject
       __vft13wxFileHistory8wxObject
@@ -989,10 +952,6 @@ EXPORTS
       sm_classwxDocManager__12wxDocManager
       ;wxView::wxView()
       __ct__6wxViewFv
-      ;wxCommandProcessor::Undo()
-      Undo__18wxCommandProcessorFv
-      ;wxCommandProcessor::SetMenuStrings()
-      SetMenuStrings__18wxCommandProcessorFv
       ;wxDocument::Save()
       Save__10wxDocumentFv
       ;wxDocument::OnChangedViewList()
@@ -1003,8 +962,6 @@ EXPORTS
       GetCurrentDocument__12wxDocManagerCFv
       ;wxDocument::DeleteAllViews()
       DeleteAllViews__10wxDocumentFv
-      ;wxCommandProcessor::CanRedo() const
-      CanRedo__18wxCommandProcessorCFv
       ;wxDocument::OnSaveDocument(const wxString&)
       OnSaveDocument__10wxDocumentFRC8wxString
       ;wxDocument::RemoveView(wxView*)
@@ -1017,8 +974,6 @@ EXPORTS
       sm_classwxDocPrintout__13wxDocPrintout
       __vft15wxDocChildFrame8wxObject
       __vft10wxDocument8wxObject
-      ;wxCommandProcessor::Submit(wxCommand*,unsigned long)
-      Submit__18wxCommandProcessorFP9wxCommandUl
       ;wxDocManager::SelectDocumentPath(wxDocTemplate**,int,wxString&,long,unsigned long)
       SelectDocumentPath__12wxDocManagerFPP13wxDocTemplateiR8wxStringlUl
       ;wxDocParentFrame::ProcessEvent(wxEvent&)
@@ -1077,7 +1032,6 @@ EXPORTS
       FileMatchesTemplate__13wxDocTemplateFRC8wxString
       ;wxDocManager::wxDocManager(long,unsigned long)
       __ct__12wxDocManagerFlUl
-      __vft18wxCommandProcessor8wxObject
       ;wxDocManager::SelectViewType(wxDocTemplate**,int,unsigned long)
       SelectViewType__12wxDocManagerFPP13wxDocTemplateiUl
       ;wxDocManager::SelectDocumentType(wxDocTemplate**,int,unsigned long)
@@ -1112,37 +1066,24 @@ EXPORTS
       wxConstructorForwxFileHistory__Fv
       ;wxDocManager::sm_eventTable
       sm_eventTable__12wxDocManager
-      ;wxCommandProcessor::sm_classwxCommandProcessor
-      sm_classwxCommandProcessor__18wxCommandProcessor
-      ;wxCommand::~wxCommand()
-      __dt__9wxCommandFv
-      ;wxCommandProcessor::~wxCommandProcessor()
-      __dt__18wxCommandProcessorFv
       ;wxDocument::SaveAs()
       SaveAs__10wxDocumentFv
       ;wxDocument::OnSaveModified()
       OnSaveModified__10wxDocumentFv
-      ;wxCommandProcessor::Initialize()
-      Initialize__18wxCommandProcessorFv
       ;wxDocManager::Initialize()
       Initialize__12wxDocManagerFv
       ;wxDocParentFrame::GetEventTable() const
       GetEventTable__16wxDocParentFrameCFv
       ;wxDocManager::GetCurrentView() const
       GetCurrentView__12wxDocManagerCFv
-      ;wxCommandProcessor::CanUndo() const
-      CanUndo__18wxCommandProcessorCFv
       ;wxDocManager::MatchTemplate(const wxString&)
       MatchTemplate__12wxDocManagerFRC8wxString
       ;wxTransferStreamToFile(istream&,const wxString&)
       wxTransferStreamToFile__FR7istreamRC8wxString
       ;wxView::sm_classwxView
       sm_classwxView__6wxView
-      ;wxCommand::wxCommand(unsigned long,const wxString&)
-      __ct__9wxCommandFUlRC8wxString
       ;wxDocManager::RemoveDocument(wxDocument*)
       RemoveDocument__12wxDocManagerFP10wxDocument
-      __vft9wxCommand8wxObject
       __vft13wxDocPrintout8wxObject
       __vft12wxDocManager8wxObject
       ;wxDocTemplate::wxDocTemplate(wxDocManager*,const wxString&,const wxString&,const wxString&,const wxString&,const wxString&,const wxString&,wxClassInfo*,wxClassInfo*,long)
@@ -1181,8 +1122,6 @@ EXPORTS
       __dt__13wxFileHistoryFv
       ;wxDocument::Revert()
       Revert__10wxDocumentFv
-      ;wxCommandProcessor::Redo()
-      Redo__18wxCommandProcessorFv
       ;wxDocument::OnCreateCommandProcessor()
       OnCreateCommandProcessor__10wxDocumentFv
       ;wxDocument::GetFirstView() const
@@ -1195,8 +1134,6 @@ EXPORTS
       DeleteContents__10wxDocumentFv
       ;wxDocument::Close()
       Close__10wxDocumentFv
-      ;wxCommandProcessor::ClearCommands()
-      ClearCommands__18wxCommandProcessorFv
       ;wxDocManager::ActivateView(wxView*,unsigned long,unsigned long)
       ActivateView__12wxDocManagerFP6wxViewUlT2
       ;wxDocument::OnOpenDocument(const wxString&)
@@ -1334,8 +1271,8 @@ EXPORTS
       ButtonUp__12wxMouseEventCFi
       ;wxMouseEvent::ButtonDown(int) const
       ButtonDown__12wxMouseEventCFi
-      ;wxConstructorForwxEraseEvent()
-      wxConstructorForwxEraseEvent__Fv
+      ;wxConstructorForwxNcPaintEvent()
+      wxConstructorForwxNcPaintEvent__Fv
       wxEVT_SET_CURSOR
       wxEVT_SCROLLWIN_LINEDOWN
       wxEVT_MENU_CHAR
@@ -1351,6 +1288,8 @@ EXPORTS
       wxConstructorForwxJoystickEvent__Fv
       ;wxConstructorForwxIconizeEvent()
       wxConstructorForwxIconizeEvent__Fv
+      ;wxConstructorForwxEraseEvent()
+      wxConstructorForwxEraseEvent__Fv
       ;wxConstructorForwxDropFilesEvent()
       wxConstructorForwxDropFilesEvent__Fv
       ;wxEvtHandler::sm_eventTableEntries
@@ -1591,6 +1530,8 @@ EXPORTS
       wxConstructorForwxActivateEvent__Fv
       ;wxEvtHandler::ProcessPendingEvents()
       ProcessPendingEvents__12wxEvtHandlerFv
+      ;wxMouseEvent::GetButton() const
+      GetButton__12wxMouseEventCFv
       ;wxWindowCreateEvent::wxWindowCreateEvent(wxWindow*)
       __ct__19wxWindowCreateEventFP8wxWindow
       wxPendingEvents
@@ -1620,6 +1561,8 @@ EXPORTS
       sm_classwxShowEvent__11wxShowEvent
       ;wxScrollWinEvent::sm_classwxScrollWinEvent
       sm_classwxScrollWinEvent__16wxScrollWinEvent
+      ;wxNcPaintEvent::sm_classwxNcPaintEvent
+      sm_classwxNcPaintEvent__14wxNcPaintEvent
       ;wxIdleEvent::sm_classwxIdleEvent
       sm_classwxIdleEvent__11wxIdleEvent
       ;wxDropFilesEvent::sm_classwxDropFilesEvent
@@ -1667,27 +1610,6 @@ EXPORTS
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
   ;From object file:  ..\common\ffile.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxFFile::Seek(long,wxSeekMode)
-      Seek__7wxFFileFl10wxSeekMode
-      ;wxFFile::Read(void*,unsigned int)
-      Read__7wxFFileFPvUi
-      ;wxFFile::Close()
-      Close__7wxFFileFv
-      ;wxFFile::Length() const
-      Length__7wxFFileCFv
-      ;wxFFile::wxFFile(const char*,const char*)
-      __ct__7wxFFileFPCcT1
-      ;wxFFile::Tell() const
-      Tell__7wxFFileCFv
-      ;wxFFile::Write(const void*,unsigned int)
-      Write__7wxFFileFPCvUi
-      ;wxFFile::Open(const char*,const char*)
-      Open__7wxFFileFPCcT1
-      ;wxFFile::Flush()
-      Flush__7wxFFileFv
-      ;wxFFile::ReadAll(wxString*)
-      ReadAll__7wxFFileFP8wxString
   ;From object file:  ..\common\file.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFile::Tell() const
@@ -2156,6 +2078,8 @@ EXPORTS
       GetClientAreaOrigin__11wxFrameBaseCFv
       ;wxFrameBase::DoMenuUpdates()
       DoMenuUpdates__11wxFrameBaseFv
+      ;wxFrameBase::IsOneOfBars(const wxWindow*) const
+      IsOneOfBars__11wxFrameBaseCFPC8wxWindow
       ;wxFrameBase::DoMenuUpdates(wxMenu*,wxWindow*)
       DoMenuUpdates__11wxFrameBaseFP6wxMenuP8wxWindow
       ;wxFrameBase::ProcessCommand(int)
@@ -2298,6 +2222,27 @@ EXPORTS
       wxProtocolUsewxFTP
       ;wxFTP::sm_classwxFTP
       sm_classwxFTP__5wxFTP
+  ;From object file:  ..\common\gaugecmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxGaugeBase::SetShadowWidth(int)
+      SetShadowWidth__11wxGaugeBaseFi
+      ;wxGaugeBase::SetBezelFace(int)
+      SetBezelFace__11wxGaugeBaseFi
+      ;wxGaugeBase::GetRange() const
+      GetRange__11wxGaugeBaseCFv
+      ;wxGaugeBase::GetShadowWidth() const
+      GetShadowWidth__11wxGaugeBaseCFv
+      ;wxGaugeBase::GetBezelFace() const
+      GetBezelFace__11wxGaugeBaseCFv
+      ;wxGaugeBase::GetValue() const
+      GetValue__11wxGaugeBaseCFv
+      ;wxGaugeBase::SetRange(int)
+      SetRange__11wxGaugeBaseFi
+      ;wxGaugeBase::Create(wxWindow*,int,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
+      Create__11wxGaugeBaseFP8wxWindowiT2RC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
+      __vft11wxGaugeBase8wxObject
+      ;wxGaugeBase::SetValue(int)
+      SetValue__11wxGaugeBaseFi
   ;From object file:  ..\common\gdicmn.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxBrushList::AddBrush(wxBrush*)
@@ -2321,9 +2266,11 @@ EXPORTS
       FindName__16wxColourDatabaseCFRC8wxColour
       ;wxPenList::AddPen(wxPen*)
       AddPen__9wxPenListFP5wxPen
-      __vft9wxPenList8wxObject
+      ;wxRect::Intersect(const wxRect&)
+      Intersect__6wxRectFRC6wxRect
       ;wxBitmapList::sm_classwxBitmapList
       sm_classwxBitmapList__12wxBitmapList
+      __vft9wxPenList8wxObject
       __vft15wxResourceCache8wxObject
       ;wxColourDatabase::wxColourDatabase(int)
       __ct__16wxColourDatabaseFi
@@ -2352,10 +2299,14 @@ EXPORTS
       RemoveFont__10wxFontListFP6wxFont
       ;wxBrushList::RemoveBrush(wxBrush*)
       RemoveBrush__11wxBrushListFP7wxBrush
+      ;wxRect::Intersects(const wxRect&) const
+      Intersects__6wxRectCFRC6wxRect
       ;wxFontList::AddFont(wxFont*)
       AddFont__10wxFontListFP6wxFont
       ;wxBitmapList::AddBitmap(wxBitmap*)
       AddBitmap__12wxBitmapListFP8wxBitmap
+      ;wxRect::Inflate(int,int)
+      Inflate__6wxRectFiT1
       ;wxBitmapList::wxBitmapList()
       __ct__12wxBitmapListFv
       ;wxDeleteStockLists()
@@ -2367,10 +2318,10 @@ EXPORTS
       ;wxBrushList::sm_classwxBrushList
       sm_classwxBrushList__11wxBrushList
       __vft16wxColourDatabase8wxObject
-      ;wxRect::wxRect(const wxPoint&,const wxPoint&)
-      __ct__6wxRectFRC7wxPointT1
       ;wxRect::wxRect(const wxPoint&,const wxSize&)
       __ct__6wxRectFRC7wxPointRC6wxSize
+      ;wxRect::wxRect(const wxPoint&,const wxPoint&)
+      __ct__6wxRectFRC7wxPointT1
       ;wxBrushList::FindOrCreateBrush(const wxColour&,int)
       FindOrCreateBrush__11wxBrushListFRC8wxColouri
       ;wxConstructorForwxBrushList()
@@ -3048,10 +2999,17 @@ EXPORTS
       wxConstructorForwxIndividualLayoutConstraint__Fv
   ;From object file:  ..\common\lboxcmn.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxListBoxBase::AppendAndEnsureVisible(const wxString&)
+      AppendAndEnsureVisible__13wxListBoxBaseFRC8wxString
       ;wxListBoxBase::SetStringSelection(const wxString&,unsigned long)
       SetStringSelection__13wxListBoxBaseFRC8wxStringUl
+      __vft13wxListBoxBase15wxItemContainer
       ;wxListBoxBase::SetFirstItem(const wxString&)
       SetFirstItem__13wxListBoxBaseFRC8wxString
+      ;wxListBoxBase::DeselectAll(int)
+      DeselectAll__13wxListBoxBaseFi
+      ;wxListBoxBase::EnsureVisible(int)
+      EnsureVisible__13wxListBoxBaseFi
       __vft13wxListBoxBase8wxObject
       ;wxListBoxBase::InsertItems(int,const wxString*,int)
       InsertItems__13wxListBoxBaseFiPC8wxStringT1
@@ -3453,6 +3411,10 @@ EXPORTS
       IsEnabled__13wxMenuBarBaseCFi
       ;wxMenuBarBase::IsChecked(int) const
       IsChecked__13wxMenuBarBaseCFi
+      ;wxMenuBarBase::FindItem(int,wxMenu**) const
+      FindItem__13wxMenuBarBaseCFiPP6wxMenu
+      ;wxMenuBarBase::Attach(wxFrame*)
+      Attach__13wxMenuBarBaseFP7wxFrame
       ;wxwxMenuItemListNode::DeleteData()
       DeleteData__20wxwxMenuItemListNodeFv
       ;wxMenuBase::~wxMenuBase()
@@ -3481,6 +3443,10 @@ EXPORTS
       Destroy__10wxMenuBaseFP10wxMenuItem
       ;wxMenuBase::Delete(wxMenuItem*)
       Delete__10wxMenuBaseFP10wxMenuItem
+      ;wxMenuBase::AddSubMenu(wxMenu*)
+      AddSubMenu__10wxMenuBaseFP6wxMenu
+      ;wxMenuBase::Detach()
+      Detach__10wxMenuBaseFv
       ;wxMenuBase::SetHelpString(int,const wxString&)
       SetHelpString__10wxMenuBaseFiRC8wxString
       ;wxMenuBarBase::Append(wxMenu*,const wxString&)
@@ -3492,6 +3458,8 @@ EXPORTS
       Enable__10wxMenuBaseFiUl
       ;wxMenuBase::FindChildItem(int,unsigned int*) const
       FindChildItem__10wxMenuBaseCFiPUi
+      ;wxMenuBase::SendEvent(int,int)
+      SendEvent__10wxMenuBaseFiT1
       ;wxMenuBase::FindItem(int,wxMenu**) const
       FindItem__10wxMenuBaseCFiPP6wxMenu
       ;wxMenuItemBase::~wxMenuItemBase()
@@ -3515,10 +3483,16 @@ EXPORTS
       DeleteData__16wxwxMenuListNodeFv
       ;wxMenuBarBase::wxMenuBarBase()
       __ct__13wxMenuBarBaseFv
-      ;wxMenuBarBase::Replace(unsigned int,wxMenu*,const wxString&)
-      Replace__13wxMenuBarBaseFUiP6wxMenuRC8wxString
+      ;wxMenuItemBase::GetAccel() const
+      GetAccel__14wxMenuItemBaseCFv
+      ;wxMenuBarBase::Detach()
+      Detach__13wxMenuBarBaseFv
+      ;wxGetAccelFromString(const wxString&)
+      wxGetAccelFromString__FRC8wxString
       ;wxMenuBarBase::SetLabel(int,const wxString&)
       SetLabel__13wxMenuBarBaseFiRC8wxString
+      ;wxMenuBarBase::Replace(unsigned int,wxMenu*,const wxString&)
+      Replace__13wxMenuBarBaseFUiP6wxMenuRC8wxString
       ;wxMenuBase::Init(long)
       Init__10wxMenuBaseFl
       __vft14wxMenuItemBase8wxObject
@@ -3528,6 +3502,10 @@ EXPORTS
       Remove__13wxMenuBarBaseFUi
       ;wxMenuBase::IsEnabled(int) const
       IsEnabled__10wxMenuBaseCFi
+      ;wxMenuBarBase::FindMenuItem(const wxString&,const wxString&) const
+      FindMenuItem__13wxMenuBarBaseCFRC8wxStringT1
+      ;wxMenuBase::Attach(wxMenuBarBase*)
+      Attach__10wxMenuBaseFP13wxMenuBarBase
       ;wxMenuBarBase::~wxMenuBarBase()
       __dt__13wxMenuBarBaseFv
       ;wxMenuBase::FindItem(const wxString&) const
@@ -3670,6 +3648,25 @@ EXPORTS
       Eof__19wxMemoryInputStreamCFv
       ;wxMemoryOutputStream::OnSysTell() const
       OnSysTell__20wxMemoryOutputStreamCFv
+  ;From object file:  ..\common\nbkbase.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxNotebookBase::AssignImageList(wxImageList*)
+      AssignImageList__14wxNotebookBaseFP11wxImageList
+      __vft14wxNotebookBase8wxObject
+      ;wxNotebookBase::DoRemovePage(int)
+      DoRemovePage__14wxNotebookBaseFi
+      ;wxNotebookBase::~wxNotebookBase()
+      __dt__14wxNotebookBaseFv
+      ;wxNotebookBase::GetNextPage(unsigned long) const
+      GetNextPage__14wxNotebookBaseCFUl
+      ;wxNotebookBase::SetImageList(wxImageList*)
+      SetImageList__14wxNotebookBaseFP11wxImageList
+      ;wxNotebookBase::DeletePage(int)
+      DeletePage__14wxNotebookBaseFi
+      ;wxNotebookBase::CalcSizeFromPage(const wxSize&)
+      CalcSizeFromPage__14wxNotebookBaseFRC6wxSize
+      ;wxNotebookBase::Init()
+      Init__14wxNotebookBaseFv
   ;From object file:  ..\common\object.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft8wxObject
@@ -3813,6 +3810,7 @@ EXPORTS
       __ct__16wxPrintPaperTypeFv
       ;wxPrintPaperDatabase::AddPaperType(wxPaperSize,const wxString&,int,int)
       AddPaperType__20wxPrintPaperDatabaseF11wxPaperSizeRC8wxStringiT3
+  ;From object file:  ..\common\popupcmn.cpp
   ;From object file:  ..\common\prntbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPreviewControlBar::OnZoom(wxCommandEvent&)
@@ -3918,6 +3916,7 @@ EXPORTS
       sm_eventTableEntries__19wxPreviewControlBar
       ;wxPreviewControlBar::sm_classwxPreviewControlBar
       sm_classwxPreviewControlBar__19wxPreviewControlBar
+      __vft15wxPreviewCanvas14wxScrollHelper
       ;wxPreviewControlBar::~wxPreviewControlBar()
       __dt__19wxPreviewControlBarFv
       ;wxPrintPreviewBase::~wxPrintPreviewBase()
@@ -3956,11 +3955,15 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxProcess::SetPipeStreams(wxInputStream*,wxOutputStream*,wxInputStream*)
       SetPipeStreams__9wxProcessFP13wxInputStreamP14wxOutputStreamT1
+      ;wxProcess::Exists(int)
+      Exists__9wxProcessFi
       ;wxConstructorForwxProcess()
       wxConstructorForwxProcess__Fv
       ;wxProcess::Init(wxEvtHandler*,int,unsigned long)
       Init__9wxProcessFP12wxEvtHandleriUl
       __vft9wxProcess8wxObject
+      ;wxProcess::Kill(int,wxSignal)
+      Kill__9wxProcessFi8wxSignal
       wxEVT_END_PROCESS
       ;wxProcess::~wxProcess()
       __dt__9wxProcessFv
@@ -4031,6 +4034,10 @@ EXPORTS
       jinit_2pass_quantizer__FP12j_decompress
       ;wxQuantize::Quantize(const wxImage&,wxImage&,int,unsigned char**,int)
       Quantize__10wxQuantizeFRC7wxImageR7wxImageiPPUcT3
+  ;From object file:  ..\common\radiocmn.cpp
+    ;PUBDEFs (Symbols available from object file):
+      ;wxRadioBoxBase::GetNextItem(int,wxDirection,long) const
+      GetNextItem__14wxRadioBoxBaseCFi11wxDirectionl
   ;From object file:  ..\common\resource.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxResourceTable::ParseResourceFile(wxInputStream*)
@@ -4353,6 +4360,8 @@ EXPORTS
       sm_classwxStaticBoxSizer__16wxStaticBoxSizer
       ;wxGridSizer::sm_classwxGridSizer
       sm_classwxGridSizer__11wxGridSizer
+      ;wxNotebookSizer::RecalcSizes()
+      RecalcSizes__15wxNotebookSizerFv
       ;wxFlexGridSizer::RecalcSizes()
       RecalcSizes__15wxFlexGridSizerFv
       ;wxGridSizer::RecalcSizes()
@@ -4397,12 +4406,15 @@ EXPORTS
       IsWindow__11wxSizerItemFv
       ;wxSizerItem::GetSize()
       GetSize__11wxSizerItemFv
+      ;wxNotebookSizer::CalcMin()
+      CalcMin__15wxNotebookSizerFv
       ;wxSizerItem::CalcMin()
       CalcMin__11wxSizerItemFv
       ;wxSizer::Remove(wxWindow*)
       Remove__7wxSizerFP8wxWindow
       ;wxSizer::FitSize(wxWindow*)
       FitSize__7wxSizerFP8wxWindow
+      __vft15wxNotebookSizer8wxObject
       __vft7wxSizer8wxObject
       ;wxSizer::Remove(int)
       Remove__7wxSizerFi
@@ -4432,6 +4444,8 @@ EXPORTS
       __ct__10wxBoxSizerFi
       ;wxSizerItem::IsSizer()
       IsSizer__11wxSizerItemFv
+      ;wxNotebookSizer::sm_classwxNotebookSizer
+      sm_classwxNotebookSizer__15wxNotebookSizer
       ;wxFlexGridSizer::sm_classwxFlexGridSizer
       sm_classwxFlexGridSizer__15wxFlexGridSizer
       ;wxBoxSizer::sm_classwxBoxSizer
@@ -4464,6 +4478,8 @@ EXPORTS
       SetItemBounds__11wxGridSizerFP11wxSizerItemiN32
       ;wxGridSizer::CalcMin()
       CalcMin__11wxGridSizerFv
+      ;wxNotebookSizer::wxNotebookSizer(wxNotebook*)
+      __ct__15wxNotebookSizerFP10wxNotebook
   ;From object file:  ..\common\socket.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSocketBase::SetTimeout(long)
@@ -5125,12 +5141,20 @@ EXPORTS
       __ct__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::SetDefaultStyle(const wxTextAttr&)
       SetDefaultStyle__14wxTextCtrlBaseFRC10wxTextAttr
+      ;wxTextCtrlBase::CanCut() const
+      CanCut__14wxTextCtrlBaseCFv
+      ;wxTextCtrlBase::CanCopy() const
+      CanCopy__14wxTextCtrlBaseCFv
       ;wxTextCtrlBase::operator<<(long)
       __ls__14wxTextCtrlBaseFl
       ;wxTextCtrlBase::~wxTextCtrlBase()
       __dt__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::GetDefaultStyle() const
       GetDefaultStyle__14wxTextCtrlBaseCFv
+      ;wxTextCtrlBase::CanPaste() const
+      CanPaste__14wxTextCtrlBaseCFv
+      ;wxTextCtrlBase::SelectAll()
+      SelectAll__14wxTextCtrlBaseFv
       ;wxTextCtrlBase::SaveFile(const wxString&)
       SaveFile__14wxTextCtrlBaseFRC8wxString
       ;wxTextCtrlBase::operator<<(const char)
@@ -5170,27 +5194,18 @@ EXPORTS
       Create__10wxTextFileFRC8wxString
   ;From object file:  ..\common\timercmn.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxTimerEvent::sm_classwxTimerEvent
-      sm_classwxTimerEvent__12wxTimerEvent
       ;wxGetLocalTimeMillis()
       wxGetLocalTimeMillis__Fv
-      __vft11wxTimerBase8wxObject
       ;wxStopWatch::GetElapsedTime() const
       GetElapsedTime__11wxStopWatchCFv
       ;wxStopWatch::Time() const
       Time__11wxStopWatchCFv
-      ;wxTimerBase::Notify()
-      Notify__11wxTimerBaseFv
       ;wxStopWatch::Start(long)
       Start__11wxStopWatchFl
       ;wxGetElapsedTime(unsigned long)
       wxGetElapsedTime__FUl
       ;wxGetLocalTime()
       wxGetLocalTime__Fv
-      ;wxTimerBase::Start(int,unsigned long)
-      Start__11wxTimerBaseFiUl
-      ;wxConstructorForwxTimerEvent()
-      wxConstructorForwxTimerEvent__Fv
       ;wxStartTimer()
       wxStartTimer__Fv
       ;wxGetUTCTime()
@@ -5203,6 +5218,8 @@ EXPORTS
       GetNextToken__17wxStringTokenizerFv
       ;wxStringTokenizer::HasMoreTokens() const
       HasMoreTokens__17wxStringTokenizerCFv
+      ;wxStringTokenize(const wxString&,const wxString&,wxStringTokenizerMode)
+      wxStringTokenize__FRC8wxStringT121wxStringTokenizerMode
       ;wxStringTokenizer::wxStringTokenizer(const wxString&,const wxString&,wxStringTokenizerMode)
       __ct__17wxStringTokenizerFRC8wxStringT121wxStringTokenizerMode
       ;wxStringTokenizer::CountTokens() const
@@ -5446,8 +5463,6 @@ EXPORTS
       wxStripMenuCodes__FRC8wxString
       ;wxSafeYield(wxWindow*)
       wxSafeYield__FP8wxWindow
-      ;wxGetAccelFromString(const wxString&)
-      wxGetAccelFromString__FRC8wxString
       ;StringMatch(char*,char*,unsigned long,unsigned long)
       StringMatch__FPcT1UlT3
       ;StringToFloat(char*,float*)
@@ -6161,6 +6176,8 @@ EXPORTS
       SetSizeConstraint__12wxWindowBaseFiN31
       ;wxWindowBase::GetClientSizeConstraint(int*,int*) const
       GetClientSizeConstraint__12wxWindowBaseCFPiT1
+      ;wxWindowBase::DoHitTest(int,int) const
+      DoHitTest__12wxWindowBaseCFiT1
       ;wxWindowBase::DoGetBestSize() const
       DoGetBestSize__12wxWindowBaseCFv
       ;wxWindowBase::TransferDataFromWindow()
@@ -6169,6 +6186,8 @@ EXPORTS
       SetSizer__12wxWindowBaseFP7wxSizer
       ;wxWindowBase::IsTopLevel() const
       IsTopLevel__12wxWindowBaseCFv
+      ;wxWindowBase::GetUpdateClientRect() const
+      GetUpdateClientRect__12wxWindowBaseCFv
       ;wxWindowBase::GetHelpText() const
       GetHelpText__12wxWindowBaseCFv
       ;wxWindowBase::DoGetClientData() const
@@ -6191,6 +6210,12 @@ EXPORTS
       SetCursor__12wxWindowBaseFRC8wxCursor
       ;wxWindowBase::ResetConstraints()
       ResetConstraints__12wxWindowBaseFv
+      ;wxWindowBase::GetDefaultBorder() const
+      GetDefaultBorder__12wxWindowBaseCFv
+      ;wxWindowBase::GetClientAreaOrigin() const
+      GetClientAreaOrigin__12wxWindowBaseCFv
+      ;wxWindowBase::GetBorder() const
+      GetBorder__12wxWindowBaseCFv
       ;wxWindowBase::Fit()
       Fit__12wxWindowBaseFv
       ;wxWindowBase::DeleteRelatedConstraints()
@@ -6954,48 +6979,6 @@ EXPORTS
       ;wxGenericDirCtrl::ExtractWildcard(const wxString&,int,wxString&,wxString&)
       ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
   ;From object file:  ..\generic\dragimgg.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,unsigned long,wxRect*)
-      BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowUlP6wxRect
-      ;wxGenericDragImage::Move(const wxPoint&)
-      Move__18wxGenericDragImageFRC7wxPoint
-      ;wxGenericDragImage::~wxGenericDragImage()
-      __dt__18wxGenericDragImageFv
-      ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,wxWindow*)
-      BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowT2
-      ;wxGenericDragImage::Show()
-      Show__18wxGenericDragImageFv
-      ;wxGenericDragImage::Hide()
-      Hide__18wxGenericDragImageFv
-      ;wxGenericDragImage::Create(const wxTreeCtrl&,wxTreeItemId&)
-      Create__18wxGenericDragImageFRC10wxTreeCtrlR12wxTreeItemId
-      __vft18wxGenericDragImage8wxObject
-      ;wxGenericDragImage::Create(const wxCursor&)
-      Create__18wxGenericDragImageFRC8wxCursor
-      ;wxConstructorForwxGenericDragImage()
-      wxConstructorForwxGenericDragImage__Fv
-      ;wxGenericDragImage::RedrawImage(const wxPoint&,const wxPoint&,unsigned long,unsigned long)
-      RedrawImage__18wxGenericDragImageFRC7wxPointT1UlT3
-      ;wxGenericDragImage::GetImageRect(const wxPoint&) const
-      GetImageRect__18wxGenericDragImageCFRC7wxPoint
-      ;wxGenericDragImage::Init()
-      Init__18wxGenericDragImageFv
-      ;wxGenericDragImage::EndDrag()
-      EndDrag__18wxGenericDragImageFv
-      ;wxGenericDragImage::Create(const wxString&,const wxCursor&)
-      Create__18wxGenericDragImageFRC8wxStringRC8wxCursor
-      ;wxGenericDragImage::Create(const wxBitmap&,const wxCursor&)
-      Create__18wxGenericDragImageFRC8wxBitmapRC8wxCursor
-      ;wxGenericDragImage::UpdateBackingFromWindow(wxDC&,wxMemoryDC&,const wxRect&,const wxRect&) const
-      UpdateBackingFromWindow__18wxGenericDragImageCFR4wxDCR10wxMemoryDCRC6wxRectT3
-      ;wxGenericDragImage::Create(const wxListCtrl&,long)
-      Create__18wxGenericDragImageFRC10wxListCtrll
-      ;wxGenericDragImage::DoDrawImage(wxDC&,const wxPoint&) const
-      DoDrawImage__18wxGenericDragImageCFR4wxDCRC7wxPoint
-      ;wxGenericDragImage::sm_classwxGenericDragImage
-      sm_classwxGenericDragImage__18wxGenericDragImage
-      ;wxGenericDragImage::Create(const wxIcon&,const wxCursor&)
-      Create__18wxGenericDragImageFRC6wxIconRC8wxCursor
   ;From object file:  ..\generic\fontdlgg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
@@ -7322,6 +7305,7 @@ EXPORTS
       sm_eventTable__26wxGridCellEditorEvtHandler
       ;wxGridCellBoolRenderer::ms_sizeCheckMark
       ms_sizeCheckMark__22wxGridCellBoolRenderer
+      __vft6wxGrid14wxScrollHelper
       __vft24wxGridCellNumberRenderer16wxGridCellWorker
       __vft22wxGridCellBoolRenderer16wxGridCellWorker
       __vft20wxGridCellTextEditor16wxGridCellWorker
@@ -8212,6 +8196,8 @@ EXPORTS
       Create__18wxSashLayoutWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxSashLayoutWindow::GetEventTable() const
       GetEventTable__18wxSashLayoutWindowCFv
+      ;wxLayoutAlgorithm::LayoutFrame(wxFrame*,wxWindow*)
+      LayoutFrame__17wxLayoutAlgorithmFP7wxFrameP8wxWindow
       ;wxSashLayoutWindow::sm_classwxSashLayoutWindow
       sm_classwxSashLayoutWindow__18wxSashLayoutWindow
       ;wxCalculateLayoutEvent::sm_classwxCalculateLayoutEvent
@@ -8291,8 +8277,6 @@ EXPORTS
       Notify__17wxListRenameTimerFv
       ;wxListMainWindow::MoveToFocus()
       MoveToFocus__16wxListMainWindowFv
-      ;wxListHeaderData::HasText() const
-      HasText__16wxListHeaderDataCFv
       ;wxListHeaderData::GetWidth() const
       GetWidth__16wxListHeaderDataCFv
       ;wxListCtrl::GetTopItem() const
@@ -8301,8 +8285,6 @@ EXPORTS
       GetItemCount__10wxListCtrlCFv
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
-      ;wxListHeaderData::GetText(wxString&)
-      GetText__16wxListHeaderDataFR8wxString
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       ;wxListMainWindow::GetItemRect(long,wxRect&)
       GetItemRect__16wxListMainWindowFlR6wxRect
@@ -8313,6 +8295,8 @@ EXPORTS
       SetMode__16wxListMainWindowFl
       ;wxListCtrl::SetItemSpacing(int,unsigned long)
       SetItemSpacing__10wxListCtrlFiUl
+      ;wxListMainWindow::SetItemCount(long)
+      SetItemCount__16wxListMainWindowFl
       ;wxListCtrl::SetDropTarget(wxDropTarget*)
       SetDropTarget__10wxListCtrlFP12wxDropTarget
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
@@ -8340,6 +8324,8 @@ EXPORTS
       SetColumnWidth__16wxListMainWindowFiT1
       ;wxListMainWindow::SelectLine(wxListLineData*)
       SelectLine__16wxListMainWindowFP14wxListLineData
+      ;wxListCtrl::OnGetItemText(long,long) const
+      OnGetItemText__10wxListCtrlCFlT1
       ;wxListHeaderData::IsHit(int,int) const
       IsHit__16wxListHeaderDataCFiT1
       ;wxListItemData::IsHit(int,int) const
@@ -8354,8 +8340,8 @@ EXPORTS
       FocusLine__16wxListMainWindowFP14wxListLineData
       ;wxListMainWindow::DeselectLine(wxListLineData*)
       DeselectLine__16wxListMainWindowFP14wxListLineData
-      ;wxListItemData::GetX() const
-      GetX__14wxListItemDataCFv
+      ;wxwxListItemDataListNode::DeleteData()
+      DeleteData__24wxwxListItemDataListNodeFv
       ;wxConstructorForwxListHeaderData()
       wxConstructorForwxListHeaderData__Fv
       ;wxConstructorForwxListCtrl()
@@ -8369,6 +8355,8 @@ EXPORTS
       SetPosition__14wxListLineDataFP4wxDCiN22
       ;wxListMainWindow::OnRenameTimer()
       OnRenameTimer__16wxListMainWindowFv
+      ;wxListItemData::GetX() const
+      GetX__14wxListItemDataCFv
       ;wxListCtrl::GetTextColour() const
       GetTextColour__10wxListCtrlCFv
       ;wxListTextCtrl::GetEventTable() const
@@ -8379,8 +8367,8 @@ EXPORTS
       DoDraw__14wxListLineDataFP4wxDCUlT2
       ;wxListItem::ClearAttributes()
       ClearAttributes__10wxListItemFv
-      ;wxListItemData::GetText(wxString&)
-      GetText__14wxListItemDataFR8wxString
+      ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
+      __ct__17wxListRenameTimerFP16wxListMainWindow
       wxEVT_COMMAND_LIST_SET_INFO
       wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
       wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
@@ -8390,8 +8378,6 @@ EXPORTS
       sm_eventTableEntries__18wxListHeaderWindow
       ;wxListMainWindow::sm_classwxListMainWindow
       sm_classwxListMainWindow__16wxListMainWindow
-      ;wxListRenameTimer::wxListRenameTimer(wxListMainWindow*)
-      __ct__17wxListRenameTimerFP16wxListMainWindow
       ;wxListCtrl::InsertColumn(long,const wxString&,int,int)
       InsertColumn__10wxListCtrlFlRC8wxStringiT3
       ;wxListMainWindow::GetTextLength(wxString&)
@@ -8411,6 +8397,8 @@ EXPORTS
       SetSingleStyle__10wxListCtrlFlUl
       ;wxListMainWindow::SetItemSpacing(int,unsigned long)
       SetItemSpacing__16wxListMainWindowFiUl
+      ;wxListCtrl::SetItemCount(long)
+      SetItemCount__10wxListCtrlFl
       ;wxListMainWindow::SendNotify(wxListLineData*,int,wxPoint)
       SendNotify__16wxListMainWindowFP14wxListLineDatai7wxPoint
       ;wxListCtrl::OnSize(wxSizeEvent&)
@@ -8463,8 +8451,8 @@ EXPORTS
       DeleteColumn__10wxListCtrlFi
       ;wxListCtrl::Arrange(int)
       Arrange__10wxListCtrlFi
-      ;wxListItemData::HasImage() const
-      HasImage__14wxListItemDataCFv
+      ;wxListMainWindow::GetItemCount() const
+      GetItemCount__16wxListMainWindowCFv
       wxEVT_COMMAND_LIST_KEY_DOWN
       ;wxConstructorForwxListMainWindow()
       wxConstructorForwxListMainWindow__Fv
@@ -8472,20 +8460,19 @@ EXPORTS
       wxConstructorForwxListLineData__Fv
       ;wxConstructorForwxListEvent()
       wxConstructorForwxListEvent__Fv
+      __vft16wxListMainWindow14wxScrollHelper
       ;wxListCtrl::SetItem(long,int,const wxString&,int)
       SetItem__10wxListCtrlFliRC8wxStringT2
       ;wxListLineData::ReverseHilight()
       ReverseHilight__14wxListLineDataFv
-      ;wxListItemData::HasText() const
-      HasText__14wxListItemDataCFv
+      ;wxListItemData::HasImage() const
+      HasImage__14wxListItemDataCFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv
       ;wxListMainWindow::GetSelectedItemCount()
       GetSelectedItemCount__16wxListMainWindowFv
       ;wxListCtrl::GetNextItem(long,int,int) const
       GetNextItem__10wxListCtrlCFliT2
-      ;wxListMainWindow::GetItemCount()
-      GetItemCount__16wxListMainWindowFv
       ;wxListItemData::GetHeight() const
       GetHeight__14wxListItemDataCFv
       ;wxListHeaderData::GetFormat() const
@@ -8527,6 +8514,8 @@ EXPORTS
       OnSetFocus__16wxListMainWindowFR12wxFocusEvent
       ;wxListMainWindow::OnKillFocus(wxFocusEvent&)
       OnKillFocus__16wxListMainWindowFR12wxFocusEvent
+      ;wxListCtrl::OnGetItemImage(long) const
+      OnGetItemImage__10wxListCtrlCFl
       ;wxListMainWindow::OnArrowChar(wxListLineData*,unsigned long)
       OnArrowChar__16wxListMainWindowFP14wxListLineDataUl
       ;wxListLineData::GetRect(wxRect&)
@@ -8584,6 +8573,8 @@ EXPORTS
       SetForegroundColour__10wxListCtrlFRC8wxColour
       ;wxListLineData::IsHilighted()
       IsHilighted__14wxListLineDataFv
+      ;wxListMainWindow::Init()
+      Init__16wxListMainWindowFv
       ;wxListCtrl::GetSelectedItemCount() const
       GetSelectedItemCount__10wxListCtrlCFv
       ;wxListMainWindow::GetMode() const
@@ -8598,6 +8589,8 @@ EXPORTS
       GetColumnCount__10wxListCtrlCFv
       ;wxListMainWindow::DeleteEverything()
       DeleteEverything__16wxListMainWindowFv
+      ;wxwxListHeaderDataListNode::DeleteData()
+      DeleteData__26wxwxListHeaderDataListNodeFv
       ;wxListMainWindow::DeleteAllItems()
       DeleteAllItems__16wxListMainWindowFv
       ;wxListCtrl::DeleteAllColumns()
@@ -8609,8 +8602,6 @@ EXPORTS
       wxEVT_COMMAND_LIST_GET_INFO
       ;wxListMainWindow::sm_eventTableEntries
       sm_eventTableEntries__16wxListMainWindow
-      ;wxListLineData::GetText(int,wxString&)
-      GetText__14wxListLineDataFiR8wxString
       ;wxListLineData::SetAttributes(wxDC*,const wxListItemAttr*,const wxColour&,const wxFont&,unsigned long)
       SetAttributes__14wxListLineDataFP4wxDCPC14wxListItemAttrRC8wxColourRC6wxFontUl
       wxEVT_COMMAND_LIST_ITEM_SELECTED
@@ -8650,6 +8641,8 @@ EXPORTS
       sm_classwxListItemData__14wxListItemData
       ;wxListHeaderData::sm_classwxListHeaderData
       sm_classwxListHeaderData__16wxListHeaderData
+      __vft26wxwxListHeaderDataListNode10wxNodeBase
+      __vft24wxwxListItemDataListNode10wxNodeBase
       ;wxListItemData::wxListItemData(const wxListItem&)
       __ct__14wxListItemDataFRC10wxListItem
       ;wxListMainWindow::SetItem(wxListItem&)
@@ -8676,6 +8669,8 @@ EXPORTS
       InsertItem__10wxListCtrlFlRC8wxStringi
       ;wxListCtrl::InsertColumn(long,wxListItem&)
       InsertColumn__10wxListCtrlFlR10wxListItem
+      ;wxListLineData::GetText(int) const
+      GetText__14wxListLineDataCFi
       ;wxListLineData::GetSize(int&,int&)
       GetSize__14wxListLineDataFRiT1
       ;wxListMainWindow::GetItemState(long,long)
@@ -8730,13 +8725,11 @@ EXPORTS
       Clear__10wxListItemFv
       ;wxListCtrl::ClearAll()
       ClearAll__10wxListCtrlFv
-      ;wxListItemData::SetText(const wxString&)
-      SetText__14wxListItemDataFRC8wxString
+      ;wxListHeaderWindow::wxListHeaderWindow(wxWindow*,int,wxListMainWindow*,const wxPoint&,const wxSize&,long,const wxString&)
+      __ct__18wxListHeaderWindowFP8wxWindowiP16wxListMainWindowRC7wxPointRC6wxSizelRC8wxString
       wxEVT_COMMAND_LIST_COL_CLICK
       wxEVT_COMMAND_LIST_BEGIN_RDRAG
       wxEVT_COMMAND_LIST_BEGIN_DRAG
-      ;wxListHeaderWindow::wxListHeaderWindow(wxWindow*,int,wxListMainWindow*,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__18wxListHeaderWindowFP8wxWindowiP16wxListMainWindowRC7wxPointRC6wxSizelRC8wxString
       ;wxListMainWindow::wxListMainWindow(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       __ct__16wxListMainWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
       ;wxListHeaderWindow::AdjustDC(wxDC&)
@@ -8785,12 +8778,12 @@ EXPORTS
       ;wxLogDialog::sm_eventTable
       sm_eventTable__11wxLogDialog
       __vft11wxLogWindow5wxLog
-      ;wxLogTextCtrl::DoLogString(const char*,long)
-      DoLogString__13wxLogTextCtrlFPCcl
-      ;wxLogDialog::OnSave(wxCommandEvent&)
-      OnSave__11wxLogDialogFR14wxCommandEvent
       ;wxLogFrame::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__10wxLogFrameFR12wxCloseEvent
+      ;wxLogDialog::OnSave(wxCommandEvent&)
+      OnSave__11wxLogDialogFR14wxCommandEvent
+      ;wxLogTextCtrl::DoLogString(const char*,long)
+      DoLogString__13wxLogTextCtrlFPCcl
       ;wxLogWindow::DoLogString(const char*,long)
       DoLogString__11wxLogWindowFPCcl
       ;wxLogStatus(wxFrame*,const char*,...)
@@ -8804,12 +8797,12 @@ EXPORTS
       ;wxLogGui::Clear()
       Clear__8wxLogGuiFv
       __vft8wxLogGui5wxLog
-      ;wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl*)
-      __ct__13wxLogTextCtrlFP10wxTextCtrl
-      __vft11wxLogDialog8wxObject
-      __vft10wxLogFrame8wxObject
       ;wxLogDialog::OnOk(wxCommandEvent&)
       OnOk__11wxLogDialogFR14wxCommandEvent
+      __vft11wxLogDialog8wxObject
+      __vft10wxLogFrame8wxObject
+      ;wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl*)
+      __ct__13wxLogTextCtrlFP10wxTextCtrl
       ;wxLogWindow::OnFrameClose(wxFrame*)
       OnFrameClose__11wxLogWindowFP7wxFrame
       ;wxLogFrame::sm_eventTable
@@ -8825,22 +8818,6 @@ EXPORTS
       ;wxLogWindow::wxLogWindow(wxFrame*,const char*,unsigned long,unsigned long)
       __ct__11wxLogWindowFP7wxFramePCcUlT3
   ;From object file:  ..\generic\numdlgg.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxGetNumberFromUser(const wxString&,const wxString&,const wxString&,long,long,long,wxWindow*,const wxPoint&)
-      wxGetNumberFromUser__FRC8wxStringN21lN24P8wxWindowRC7wxPoint
-      ;wxNumberEntryDialog::GetEventTable() const
-      GetEventTable__19wxNumberEntryDialogCFv
-      ;wxNumberEntryDialog::sm_eventTableEntries
-      sm_eventTableEntries__19wxNumberEntryDialog
-      ;wxNumberEntryDialog::OnOK(wxCommandEvent&)
-      OnOK__19wxNumberEntryDialogFR14wxCommandEvent
-      ;wxNumberEntryDialog::wxNumberEntryDialog(wxWindow*,const wxString&,const wxString&,const wxString&,long,long,long,const wxPoint&)
-      __ct__19wxNumberEntryDialogFP8wxWindowRC8wxStringN22lN25RC7wxPoint
-      ;wxNumberEntryDialog::OnCancel(wxCommandEvent&)
-      OnCancel__19wxNumberEntryDialogFR14wxCommandEvent
-      __vft19wxNumberEntryDialog8wxObject
-      ;wxNumberEntryDialog::sm_eventTable
-      sm_eventTable__19wxNumberEntryDialog
   ;From object file:  ..\generic\panelg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPanel::OnSysColourChanged(wxSysColourChangedEvent&)
@@ -9007,668 +8984,8 @@ EXPORTS
       ;wxProgressDialog::~wxProgressDialog()
       __dt__16wxProgressDialogFv
   ;From object file:  ..\generic\prop.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxPropertyValue::wxPropertyValue(unsigned long)
-      __ct__15wxPropertyValueFUl
-      ;wxPropertyValue::wxPropertyValue(double)
-      __ct__15wxPropertyValueFd
-      ;wxPropertyValue::operator=(const long*)
-      __as__15wxPropertyValueFPCl
-      ;wxPropertyValidator::DoubleToString(double)
-      DoubleToString__19wxPropertyValidatorFd
-      ;wxPropertyValidator::StringToInt(char*,int*)
-      StringToInt__19wxPropertyValidatorFPcPi
-      ;wxPropertyValue::sm_classwxPropertyValue
-      sm_classwxPropertyValue__15wxPropertyValue
-      ;wxPropertyValidatorRegistry::sm_classwxPropertyValidatorRegistry
-      sm_classwxPropertyValidatorRegistry__27wxPropertyValidatorRegistry
-      ;wxConstructorForwxPropertyValue()
-      wxConstructorForwxPropertyValue__Fv
-      ;wxConstructorForwxProperty()
-      wxConstructorForwxProperty__Fv
-      ;wxConstructorForwxPropertyValidatorRegistry()
-      wxConstructorForwxPropertyValidatorRegistry__Fv
-      ;wxConstructorForwxPropertySheet()
-      wxConstructorForwxPropertySheet__Fv
-      ;wxProperty::~wxProperty()
-      __dt__10wxPropertyFv
-      ;wxPropertyValue::wxPropertyValue(float)
-      __ct__15wxPropertyValueFf
-      ;wxPropertyValue::wxPropertyValue(float*)
-      __ct__15wxPropertyValueFPf
-      ;wxPropertyValue::NewCopy() const
-      NewCopy__15wxPropertyValueCFv
-      ;wxPropertyValue::IntegerValue() const
-      IntegerValue__15wxPropertyValueCFv
-      ;wxProperty::GetName() const
-      GetName__10wxPropertyCFv
-      ;wxPropertyValue::BoolValue() const
-      BoolValue__15wxPropertyValueCFv
-      ;wxProperty::SetName(wxString&)
-      SetName__10wxPropertyFR8wxString
-      ;wxPropertySheet::GetProperty(const wxString&) const
-      GetProperty__15wxPropertySheetCFRC8wxString
-      ;wxPropertyValue::wxPropertyValue(wxStringList*)
-      __ct__15wxPropertyValueFP12wxStringList
-      __vft15wxPropertyValue8wxObject
-      ;wxPropertyValue::operator=(const unsigned long*)
-      __as__15wxPropertyValueFPCUl
-      ;wxPropertyValidator::StringToDouble(char*,double*)
-      StringToDouble__19wxPropertyValidatorFPcPd
-      ;wxPropertyValue::Append(wxPropertyValue*)
-      Append__15wxPropertyValueFP15wxPropertyValue
-      ;wxProperty::sm_classwxProperty
-      sm_classwxProperty__10wxProperty
-      ;wxPropertyValue::Delete(wxPropertyValue*)
-      Delete__15wxPropertyValueFP15wxPropertyValue
-      ;wxPropertyValue::Copy(wxPropertyValue&)
-      Copy__15wxPropertyValueFR15wxPropertyValue
-      ;wxPropertyValue::Arg(wxPropertyValueType,int) const
-      Arg__15wxPropertyValueCF19wxPropertyValueTypei
-      ;wxPropertySheet::AddProperty(wxProperty*)
-      AddProperty__15wxPropertySheetFP10wxProperty
-      ;wxPropertyValue::wxPropertyValue()
-      __ct__15wxPropertyValueFv
-      ;wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry()
-      __dt__27wxPropertyValidatorRegistryFv
-      ;wxPropertyValidator::~wxPropertyValidator()
-      __dt__19wxPropertyValidatorFv
-      ;wxPropertyView::~wxPropertyView()
-      __dt__14wxPropertyViewFv
-      ;wxProperty::wxProperty()
-      __ct__10wxPropertyFv
-      ;wxProperty::wxProperty(wxString,wxString,wxPropertyValidator*)
-      __ct__10wxPropertyF8wxStringT1P19wxPropertyValidator
-      ;wxPropertyValue::operator=(const float)
-      __as__15wxPropertyValueFCf
-      ;wxPropertyValue::RealValuePtr() const
-      RealValuePtr__15wxPropertyValueCFv
-      ;wxPropertyValue::GetStringRepresentation()
-      GetStringRepresentation__15wxPropertyValueFv
-      ;wxPropertyValue::BoolValuePtr() const
-      BoolValuePtr__15wxPropertyValueCFv
-      ;wxPropertyValue::wxPropertyValue(const char*)
-      __ct__15wxPropertyValueFPCc
-      ;wxPropertyValue::wxPropertyValue(const wxString&)
-      __ct__15wxPropertyValueFRC8wxString
-      ;wxPropertyValue::operator=(const wxString&)
-      __as__15wxPropertyValueFRC8wxString
-      ;wxPropertySheet::HasProperty(const wxString&) const
-      HasProperty__15wxPropertySheetCFRC8wxString
-      ;wxPropertyValidatorRegistry::GetValidator(const wxString&)
-      GetValidator__27wxPropertyValidatorRegistryFRC8wxString
-      ;wxPropertyValue::wxPropertyValue(long)
-      __ct__15wxPropertyValueFl
-      __vft19wxPropertyValidator8wxObject
-      __vft14wxPropertyView8wxObject
-      ;wxPropertyValue::wxPropertyValue(long*)
-      __ct__15wxPropertyValueFPl
-      ;wxPropertyValue::wxPropertyValue(const wxPropertyValue&)
-      __ct__15wxPropertyValueFRC15wxPropertyValue
-      ;wxProperty::wxProperty(wxProperty&)
-      __ct__10wxPropertyFR10wxProperty
-      ;wxPropertyValue::operator=(const wxPropertyValue&)
-      __as__15wxPropertyValueFRC15wxPropertyValue
-      ;wxPropertySheet::SetProperty(const wxString&,const wxPropertyValue&)
-      SetProperty__15wxPropertySheetFRC8wxStringRC15wxPropertyValue
-      ;wxPropertyValue::Nth(int) const
-      Nth__15wxPropertyValueCFi
-      ;wxPropertyView::AddRegistry(wxPropertyValidatorRegistry*)
-      AddRegistry__14wxPropertyViewFP27wxPropertyValidatorRegistry
-      ;wxPropertyValue::~wxPropertyValue()
-      __dt__15wxPropertyValueFv
-      ;wxPropertySheet::~wxPropertySheet()
-      __dt__15wxPropertySheetFv
-      ;wxPropertyValidatorRegistry::wxPropertyValidatorRegistry()
-      __ct__27wxPropertyValidatorRegistryFv
-      ;wxProperty::wxProperty(wxString,const wxPropertyValue&,wxString,wxPropertyValidator*)
-      __ct__10wxPropertyF8wxStringRC15wxPropertyValueT1P19wxPropertyValidator
-      ;wxPropertyValue::StringValuePtr() const
-      StringValuePtr__15wxPropertyValueCFv
-      ;wxPropertyValidator::StringToFloat(char*,float*)
-      StringToFloat__19wxPropertyValidatorFPcPf
-      ;wxPropertyValidatorRegistry::RegisterValidator(const wxString&,wxPropertyValidator*)
-      RegisterValidator__27wxPropertyValidatorRegistryFRC8wxStringP19wxPropertyValidator
-      ;wxPropertyValue::IntegerValuePtr() const
-      IntegerValuePtr__15wxPropertyValueCFv
-      ;wxProperty::GetValidator() const
-      GetValidator__10wxPropertyCFv
-      ;wxPropertyValidatorRegistry::ClearRegistry()
-      ClearRegistry__27wxPropertyValidatorRegistryFv
-      ;wxPropertyValue::ClearList()
-      ClearList__15wxPropertyValueFv
-      ;wxPropertyValue::wxPropertyValue(char**)
-      __ct__15wxPropertyValueFPPc
-      ;wxPropertySheet::wxPropertySheet(const wxString&)
-      __ct__15wxPropertySheetFRC8wxString
-      ;wxPropertyValue::WritePropertyType(wxString&)
-      WritePropertyType__15wxPropertyValueFR8wxString
-      ;wxPropertySheet::RemoveProperty(const wxString&)
-      RemoveProperty__15wxPropertySheetFRC8wxString
-      ;wxPropertyValue::wxPropertyValue(unsigned long*)
-      __ct__15wxPropertyValueFPUl
-      __vft27wxPropertyValidatorRegistry8wxObject
-      __vft15wxPropertySheet8wxObject
-      __vft10wxProperty8wxObject
-      ;wxPropertyValidator::wxPropertyValidator(long)
-      __ct__19wxPropertyValidatorFl
-      ;wxPropertyView::wxPropertyView(long)
-      __ct__14wxPropertyViewFl
-      ;wxPropertyValue::operator=(const long)
-      __as__15wxPropertyValueFCl
-      ;wxPropertySheet::SetAllModified(unsigned long)
-      SetAllModified__15wxPropertySheetFUl
-      ;wxPropertyValidator::LongToString(long)
-      LongToString__19wxPropertyValidatorFl
-      ;wxProperty::SetValue(const wxPropertyValue&)
-      SetValue__10wxPropertyFRC15wxPropertyValue
-      ;wxPropertyValidator::IntToString(int)
-      IntToString__19wxPropertyValidatorFi
-      ;wxPropertyView::FindPropertyValidator(wxProperty*)
-      FindPropertyValidator__14wxPropertyViewFP10wxProperty
-      ;wxPropertyValue::operator=(const float*)
-      __as__15wxPropertyValueFPCf
-      ;wxProperty::GetValue() const
-      GetValue__10wxPropertyCFv
-      ;wxPropertyValue::WritePropertyClause(wxString&)
-      WritePropertyClause__15wxPropertyValueFR8wxString
-      ;wxPropertyView::sm_classwxPropertyView
-      sm_classwxPropertyView__14wxPropertyView
-      ;wxProperty::SetRole(wxString&)
-      SetRole__10wxPropertyFR8wxString
-      ;wxPropertyValue::wxPropertyValue(wxList*)
-      __ct__15wxPropertyValueFP6wxList
-      ;wxPropertySheet::sm_classwxPropertySheet
-      sm_classwxPropertySheet__15wxPropertySheet
-      ;wxPropertyValue::operator=(const unsigned long)
-      __as__15wxPropertyValueFCUl
-      ;wxPropertyValidator::StringToLong(char*,long*)
-      StringToLong__19wxPropertyValidatorFPcPl
-      ;wxPropertyValue::Insert(wxPropertyValue*)
-      Insert__15wxPropertyValueFP15wxPropertyValue
-      ;wxProperty::operator=(const wxPropertyValue&)
-      __as__10wxPropertyFRC15wxPropertyValue
-      ;wxPropertyValue::Number() const
-      Number__15wxPropertyValueCFv
-      ;wxConstructorForwxPropertyView()
-      wxConstructorForwxPropertyView__Fv
-      ;wxPropertyValidator::sm_classwxPropertyValidator
-      sm_classwxPropertyValidator__19wxPropertyValidator
-      ;wxPropertyValue::StringValue() const
-      StringValue__15wxPropertyValueCFv
-      ;wxProperty::SetValidator(wxPropertyValidator*)
-      SetValidator__10wxPropertyFP19wxPropertyValidator
-      ;wxPropertyValue::RealValue() const
-      RealValue__15wxPropertyValueCFv
-      ;wxProperty::GetRole() const
-      GetRole__10wxPropertyCFv
-      ;wxPropertyValidator::FloatToString(float)
-      FloatToString__19wxPropertyValidatorFf
-      ;wxPropertySheet::Clear()
-      Clear__15wxPropertySheetFv
-      ;wxPropertyValue::operator=(const char**)
-      __as__15wxPropertyValueFPPCc
-      ;wxPropertySheet::UpdateAllViews(wxPropertyView*)
-      UpdateAllViews__15wxPropertySheetFP14wxPropertyView
   ;From object file:  ..\generic\propform.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxPropertyFormView::OnUpdate(wxCommandEvent&)
-      OnUpdate__18wxPropertyFormViewFR14wxCommandEvent
-      __vft20wxPropertyFormDialog8wxObject
-      ;wxPropertyFormView::OnRevert(wxCommandEvent&)
-      OnRevert__18wxPropertyFormViewFR14wxCommandEvent
-      ;wxConstructorForwxPropertyFormView()
-      wxConstructorForwxPropertyFormView__Fv
-      ;wxPropertyFormValidator::sm_classwxPropertyFormValidator
-      sm_classwxPropertyFormValidator__23wxPropertyFormValidator
-      ;wxPropertyFormDialog::GetEventTable() const
-      GetEventTable__20wxPropertyFormDialogCFv
-      ;wxPropertyFormView::AssociateNames()
-      AssociateNames__18wxPropertyFormViewFv
-      ;wxPropertyFormFrame::OnCreatePanel(wxFrame*,wxPropertyFormView*)
-      OnCreatePanel__19wxPropertyFormFrameFP7wxFrameP18wxPropertyFormView
-      ;wxPropertyFormView::sm_eventTableEntries
-      sm_eventTableEntries__18wxPropertyFormView
-      ;wxPropertyFormView::sm_classwxPropertyFormView
-      sm_classwxPropertyFormView__18wxPropertyFormView
-      ;wxBoolFormValidator::OnDisplayValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnDisplayValue__19wxBoolFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxIntegerFormValidator::OnCheckValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnCheckValue__22wxIntegerFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormView::wxPropertyFormView(wxWindow*,long)
-      __ct__18wxPropertyFormViewFP8wxWindowl
-      ;wxPropertyFormPanel::sm_classwxPropertyFormPanel
-      sm_classwxPropertyFormPanel__19wxPropertyFormPanel
-      __vft19wxRealFormValidator8wxObject
-      __vft18wxPropertyFormView8wxObject
-      ;wxPropertyFormDialog::ProcessEvent(wxEvent&)
-      ProcessEvent__20wxPropertyFormDialogFR7wxEvent
-      ;wxPropertyFormPanel::ProcessEvent(wxEvent&)
-      ProcessEvent__19wxPropertyFormPanelFR7wxEvent
-      ;wxPropertyFormView::ProcessEvent(wxEvent&)
-      ProcessEvent__18wxPropertyFormViewFR7wxEvent
-      ;wxPropertyFormPanel::OnDefaultAction(wxControl*)
-      OnDefaultAction__19wxPropertyFormPanelFP9wxControl
-      ;wxPropertyFormDialog::OnCommand(wxWindow&,wxCommandEvent&)
-      OnCommand__20wxPropertyFormDialogFR8wxWindowR14wxCommandEvent
-      ;wxPropertyFormView::OnUpdateView()
-      OnUpdateView__18wxPropertyFormViewFv
-      ;wxConstructorForwxStringFormValidator()
-      wxConstructorForwxStringFormValidator__Fv
-      ;wxConstructorForwxPropertyFormDialog()
-      wxConstructorForwxPropertyFormDialog__Fv
-      ;wxPropertyFormView::OnClose()
-      OnClose__18wxPropertyFormViewFv
-      ;wxRealFormValidator::OnCheckValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnCheckValue__19wxRealFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormView::sm_eventTable
-      sm_eventTable__18wxPropertyFormView
-      ;wxPropertyFormDialog::sm_classwxPropertyFormDialog
-      sm_classwxPropertyFormDialog__20wxPropertyFormDialog
-      ;wxIntegerFormValidator::OnRetrieveValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnRetrieveValue__22wxIntegerFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxBoolFormValidator::OnRetrieveValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnRetrieveValue__19wxBoolFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxStringFormValidator::OnCheckValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnCheckValue__21wxStringFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormView::OnCancel(wxCommandEvent&)
-      OnCancel__18wxPropertyFormViewFR14wxCommandEvent
-      __vft19wxPropertyFormPanel8wxObject
-      ;wxPropertyFormDialog::OnDefaultAction(wxControl*)
-      OnDefaultAction__20wxPropertyFormDialogFP9wxControl
-      ;wxPropertyFormPanel::OnCommand(wxWindow&,wxCommandEvent&)
-      OnCommand__19wxPropertyFormPanelFR8wxWindowR14wxCommandEvent
-      ;wxPropertyFormFrame::sm_eventTable
-      sm_eventTable__19wxPropertyFormFrame
-      ;wxPropertyFormView::Check()
-      Check__18wxPropertyFormViewFv
-      ;wxConstructorForwxPropertyFormPanel()
-      wxConstructorForwxPropertyFormPanel__Fv
-      ;wxBoolFormValidator::sm_classwxBoolFormValidator
-      sm_classwxBoolFormValidator__19wxBoolFormValidator
-      ;wxPropertyFormView::TransferToPropertySheet()
-      TransferToPropertySheet__18wxPropertyFormViewFv
-      ;wxPropertyFormFrame::Initialize()
-      Initialize__19wxPropertyFormFrameFv
-      ;wxPropertyFormView::sm_dialogCancelled
-      sm_dialogCancelled__18wxPropertyFormView
-      ;wxPropertyFormView::OnOk(wxCommandEvent&)
-      OnOk__18wxPropertyFormViewFR14wxCommandEvent
-      __vft22wxIntegerFormValidator8wxObject
-      __vft21wxStringFormValidator8wxObject
-      __vft19wxPropertyFormFrame8wxObject
-      __vft19wxBoolFormValidator8wxObject
-      ;wxPropertyFormView::OnHelp(wxCommandEvent&)
-      OnHelp__18wxPropertyFormViewFR14wxCommandEvent
-      ;wxPropertyFormView::OnDoubleClick(wxControl*)
-      OnDoubleClick__18wxPropertyFormViewFP9wxControl
-      ;wxPropertyFormDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__20wxPropertyFormDialogFR12wxCloseEvent
-      ;wxPropertyFormFrame::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__19wxPropertyFormFrameFR12wxCloseEvent
-      ;wxPropertyFormFrame::sm_eventTableEntries
-      sm_eventTableEntries__19wxPropertyFormFrame
-      ;wxPropertyFormView::~wxPropertyFormView()
-      __dt__18wxPropertyFormViewFv
-      ;wxConstructorForwxRealFormValidator()
-      wxConstructorForwxRealFormValidator__Fv
-      ;wxConstructorForwxIntegerFormValidator()
-      wxConstructorForwxIntegerFormValidator__Fv
-      ;wxConstructorForwxBoolFormValidator()
-      wxConstructorForwxBoolFormValidator__Fv
-      ;wxStringFormValidator::sm_classwxStringFormValidator
-      sm_classwxStringFormValidator__21wxStringFormValidator
-      ;wxRealFormValidator::sm_classwxRealFormValidator
-      sm_classwxRealFormValidator__19wxRealFormValidator
-      ;wxIntegerFormValidator::sm_classwxIntegerFormValidator
-      sm_classwxIntegerFormValidator__22wxIntegerFormValidator
-      ;wxPropertyFormFrame::GetEventTable() const
-      GetEventTable__19wxPropertyFormFrameCFv
-      ;wxStringFormValidator::OnRetrieveValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnRetrieveValue__21wxStringFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormDialog::sm_eventTable
-      sm_eventTable__20wxPropertyFormDialog
-      ;wxStringFormValidator::OnDisplayValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnDisplayValue__21wxStringFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxPropertyFormView::OnCommand(wxWindow&,wxCommandEvent&)
-      OnCommand__18wxPropertyFormViewFR8wxWindowR14wxCommandEvent
-      ;wxStringFormValidator::wxStringFormValidator(wxStringList*,long)
-      __ct__21wxStringFormValidatorFP12wxStringListl
-      ;wxPropertyFormFrame::sm_classwxPropertyFormFrame
-      sm_classwxPropertyFormFrame__19wxPropertyFormFrame
-      ;wxPropertyFormView::GetEventTable() const
-      GetEventTable__18wxPropertyFormViewCFv
-      ;wxConstructorForwxPropertyFormFrame()
-      wxConstructorForwxPropertyFormFrame__Fv
-      ;wxPropertyFormView::TransferToDialog()
-      TransferToDialog__18wxPropertyFormViewFv
-      ;wxPropertyFormView::ShowView(wxPropertySheet*,wxWindow*)
-      ShowView__18wxPropertyFormViewFP15wxPropertySheetP8wxWindow
-      ;wxPropertyFormDialog::sm_eventTableEntries
-      sm_eventTableEntries__20wxPropertyFormDialog
-      ;wxPropertyFormDialog::wxPropertyFormDialog(wxPropertyFormView*,wxWindow*,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__20wxPropertyFormDialogFP18wxPropertyFormViewP8wxWindowRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxRealFormValidator::OnRetrieveValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnRetrieveValue__19wxRealFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxIntegerFormValidator::OnDisplayValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnDisplayValue__22wxIntegerFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxRealFormValidator::OnDisplayValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnDisplayValue__19wxRealFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
-      ;wxBoolFormValidator::OnCheckValue(wxProperty*,wxPropertyFormView*,wxWindow*)
-      OnCheckValue__19wxBoolFormValidatorFP10wxPropertyP18wxPropertyFormViewP8wxWindow
   ;From object file:  ..\generic\proplist.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxPropertyListView::ShowView(wxPropertySheet*,wxPanel*)
-      ShowView__18wxPropertyListViewFP15wxPropertySheetP7wxPanel
-      ;wxPropertyListPanel::sm_eventTableEntries
-      sm_eventTableEntries__19wxPropertyListPanel
-      ;wxPropertyListPanel::sm_classwxPropertyListPanel
-      sm_classwxPropertyListPanel__19wxPropertyListPanel
-      __vft23wxFilenameListValidator8wxObject
-      __vft21wxStringListValidator8wxObject
-      ;wxColourListValidator::wxColourListValidator(long)
-      __ct__21wxColourListValidatorFl
-      ;wxPropertyListView::ShowTextControl(unsigned long)
-      ShowTextControl__18wxPropertyListViewFUl
-      ;wxPropertyListView::ShowListBoxControl(unsigned long)
-      ShowListBoxControl__18wxPropertyListViewFUl
-      ;wxPropertyListView::OnPropertySelect(wxCommandEvent&)
-      OnPropertySelect__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::OnPropertyDoubleClick(wxCommandEvent&)
-      OnPropertyDoubleClick__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::OnEdit(wxCommandEvent&)
-      OnEdit__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListPanel::OnDefaultAction(wxControl*)
-      OnDefaultAction__19wxPropertyListPanelFP9wxControl
-      ;wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__32wxPropertyStringListEditorDialogFR12wxCloseEvent
-      ;wxPropertyListView::EnableCheck(unsigned long)
-      EnableCheck__18wxPropertyListViewFUl
-      ;wxPropertyListView::OnUpdateView()
-      OnUpdateView__18wxPropertyListViewFv
-      ;wxConstructorForwxFilenameListValidator()
-      wxConstructorForwxFilenameListValidator__Fv
-      ;wxFilenameListValidator::sm_classwxFilenameListValidator
-      sm_classwxFilenameListValidator__23wxFilenameListValidator
-      ;wxBoolListValidator::sm_classwxBoolListValidator
-      sm_classwxBoolListValidator__19wxBoolListValidator
-      ;wxPropertyStringListEditorDialog::SaveCurrentSelection()
-      SaveCurrentSelection__32wxPropertyStringListEditorDialogFv
-      ;wxPropertyStringListEditorDialog::GetEventTable() const
-      GetEventTable__32wxPropertyStringListEditorDialogCFv
-      ;wxPropertyListPanel::GetEventTable() const
-      GetEventTable__19wxPropertyListPanelCFv
-      ;wxPropertyListFrame::GetEventTable() const
-      GetEventTable__19wxPropertyListFrameCFv
-      ;wxPropertyListFrame::OnCreatePanel(wxFrame*,wxPropertyListView*)
-      OnCreatePanel__19wxPropertyListFrameFP7wxFrameP18wxPropertyListView
-      ;wxPropertyListDialog::sm_eventTableEntries
-      sm_eventTableEntries__20wxPropertyListDialog
-      ;wxPropertyListView::sm_dialogCancelled
-      sm_dialogCancelled__18wxPropertyListView
-      ;wxPropertyListView::sm_classwxPropertyListView
-      sm_classwxPropertyListView__18wxPropertyListView
-      ;wxListOfStringsListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxIntegerListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__22wxIntegerListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListValidator::OnClearControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnClearControls__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxRealListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__19wxRealListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListView::EnableCross(unsigned long)
-      EnableCross__18wxPropertyListViewFUl
-      __vft23wxPropertyListValidator8wxObject
-      __vft19wxPropertyListPanel8wxObject
-      __vft19wxPropertyListFrame8wxObject
-      __vft19wxBoolListValidator8wxObject
-      __vft18wxPropertyListView8wxObject
-      ;wxListOfStringsListValidator::wxListOfStringsListValidator(long)
-      __ct__28wxListOfStringsListValidatorFl
-      ;wxPropertyListDialog::ProcessEvent(wxEvent&)
-      ProcessEvent__20wxPropertyListDialogFR7wxEvent
-      ;wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent&)
-      OnDelete__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListDialog::OnDefaultAction(wxControl*)
-      OnDefaultAction__20wxPropertyListDialogFP9wxControl
-      ;wxPropertyListView::OnCross(wxCommandEvent&)
-      OnCross__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::MakeNameValueString(wxString,wxString)
-      MakeNameValueString__18wxPropertyListViewF8wxStringT1
-      ;wxPropertyListFrame::sm_classwxPropertyListFrame
-      sm_classwxPropertyListFrame__19wxPropertyListFrame
-      ;wxPropertyListView::EditProperty(wxProperty*)
-      EditProperty__18wxPropertyListViewFP10wxProperty
-      ;wxConstructorForwxPropertyTextEdit()
-      wxConstructorForwxPropertyTextEdit__Fv
-      ;wxConstructorForwxPropertyListView()
-      wxConstructorForwxPropertyListView__Fv
-      ;wxConstructorForwxPropertyListDialog()
-      wxConstructorForwxPropertyListDialog__Fv
-      ;wxConstructorForwxIntegerListValidator()
-      wxConstructorForwxIntegerListValidator__Fv
-      ;wxRealListValidator::sm_classwxRealListValidator
-      sm_classwxRealListValidator__19wxRealListValidator
-      ;wxIntegerListValidator::sm_classwxIntegerListValidator
-      sm_classwxIntegerListValidator__22wxIntegerListValidator
-      ;wxPropertyStringListEditorDialog::ShowCurrentSelection()
-      ShowCurrentSelection__32wxPropertyStringListEditorDialogFv
-      ;wxPropertyTextEdit::OnSetFocus()
-      OnSetFocus__18wxPropertyTextEditFv
-      ;wxPropertyListView::OnClose()
-      OnClose__18wxPropertyListViewFv
-      ;wxPropertyListValidator::OnSelect(unsigned long,wxProperty*,wxPropertyListView*,wxWindow*)
-      OnSelect__23wxPropertyListValidatorFUlP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyStringListEditorDialog::sm_eventTableEntries
-      sm_eventTableEntries__32wxPropertyStringListEditorDialog
-      ;wxFilenameListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxRealListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__19wxRealListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView*,wxWindow*,const int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__18wxPropertyTextEditFP18wxPropertyListViewP8wxWindowCiRC8wxStringRC7wxPointRC6wxSizelT4
-      ;wxPropertyTextEdit::sm_classwxPropertyTextEdit
-      sm_classwxPropertyTextEdit__18wxPropertyTextEdit
-      __vft32wxPropertyStringListEditorDialog8wxObject
-      __vft28wxListOfStringsListValidator8wxObject
-      __vft20wxPropertyListDialog8wxObject
-      __vft19wxRealListValidator8wxObject
-      ;wxFilenameListValidator::wxFilenameListValidator(wxString,wxString,long)
-      __ct__23wxFilenameListValidatorF8wxStringT1l
-      ;wxStringListValidator::wxStringListValidator(wxStringList*,long)
-      __ct__21wxStringListValidatorFP12wxStringListl
-      ;wxPropertyListView::wxPropertyListView(wxPanel*,long)
-      __ct__18wxPropertyListViewFP7wxPanell
-      ;wxPropertyListView::ShowProperty(wxProperty*,unsigned long)
-      ShowProperty__18wxPropertyListViewFP10wxPropertyUl
-      ;wxPropertyListDialog::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__20wxPropertyListDialogFR12wxCloseEvent
-      ;wxPropertyListDialog::OnCancel(wxCommandEvent&)
-      OnCancel__20wxPropertyListDialogFR14wxCommandEvent
-      ;wxPropertyListView::OnCancel(wxCommandEvent&)
-      OnCancel__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent&)
-      OnAdd__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListView::UpdatePropertyDisplayInList(wxProperty*)
-      UpdatePropertyDisplayInList__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::EndDetailedEditing()
-      EndDetailedEditing__18wxPropertyListViewFv
-      ;wxConstructorForwxBoolListValidator()
-      wxConstructorForwxBoolListValidator__Fv
-      ;wxListOfStringsListValidator::sm_classwxListOfStringsListValidator
-      sm_classwxListOfStringsListValidator__28wxListOfStringsListValidator
-      ;wxColourListValidator::sm_classwxColourListValidator
-      sm_classwxColourListValidator__21wxColourListValidator
-      ;wxPropertyListView::CreateControls()
-      CreateControls__18wxPropertyListViewFv
-      ;wxPropertyListDialog::wxPropertyListDialog(wxPropertyListView*,wxWindow*,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      __ct__20wxPropertyListDialogFP18wxPropertyListViewP8wxWindowRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxPropertyListDialog::sm_eventTable
-      sm_eventTable__20wxPropertyListDialog
-      ;wxPropertyStringListEditorDialog::sm_dialogCancelled
-      sm_dialogCancelled__32wxPropertyStringListEditorDialog
-      ;wxStringListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnPrepareDetailControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareDetailControls__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListValidator::OnEdit(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnEdit__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnClearDetailControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnClearDetailControls__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnClearDetailControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnClearDetailControls__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxIntegerListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__22wxIntegerListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListView::UpdatePropertyList(unsigned long)
-      UpdatePropertyList__18wxPropertyListViewFUl
-      ;wxPropertyListPanel::sm_eventTable
-      sm_eventTable__19wxPropertyListPanel
-      __vft21wxColourListValidator8wxObject
-      ;wxPropertyStringListEditorDialog::OnText(wxCommandEvent&)
-      OnText__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListPanel::OnSize(wxSizeEvent&)
-      OnSize__19wxPropertyListPanelFR11wxSizeEvent
-      ;wxPropertyStringListEditorDialog::OnOK(wxCommandEvent&)
-      OnOK__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListFrame::OnCloseWindow(wxCloseEvent&)
-      OnCloseWindow__19wxPropertyListFrameFR12wxCloseEvent
-      ;wxPropertyListView::FindListIndexForProperty(wxProperty*)
-      FindListIndexForProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::RetrieveProperty(wxProperty*)
-      RetrieveProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::EndShowingProperty(wxProperty*)
-      EndShowingProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::DisplayProperty(wxProperty*)
-      DisplayProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyListView::BeginShowingProperty(wxProperty*)
-      BeginShowingProperty__18wxPropertyListViewFP10wxProperty
-      ;wxPropertyTextEdit::OnKillFocus()
-      OnKillFocus__18wxPropertyTextEditFv
-      ;wxConstructorForwxStringListValidator()
-      wxConstructorForwxStringListValidator__Fv
-      ;wxConstructorForwxPropertyListFrame()
-      wxConstructorForwxPropertyListFrame__Fv
-      ;wxConstructorForwxListOfStringsListValidator()
-      wxConstructorForwxListOfStringsListValidator__Fv
-      ;wxFilenameListValidator::~wxFilenameListValidator()
-      __dt__23wxFilenameListValidatorFv
-      ;wxColourListValidator::~wxColourListValidator()
-      __dt__21wxColourListValidatorFv
-      ;wxPropertyListFrame::Initialize()
-      Initialize__19wxPropertyListFrameFv
-      ;wxPropertyListDialog::GetEventTable() const
-      GetEventTable__20wxPropertyListDialogCFv
-      ;wxPropertyListView::BeginDetailedEditing()
-      BeginDetailedEditing__18wxPropertyListViewFv
-      ;wxPropertyListValidator::OnValueListSelect(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnValueListSelect__23wxPropertyListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListView::sm_eventTable
-      sm_eventTable__18wxPropertyListView
-      ;wxPropertyListDialog::sm_classwxPropertyListDialog
-      sm_classwxPropertyListDialog__20wxPropertyListDialog
-      ;wxRealListValidator::OnRetrieveValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnRetrieveValue__19wxRealListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxIntegerListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__22wxIntegerListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxStringListValidator::OnPrepareControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareControls__21wxStringListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::OnEdit(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnEdit__28wxListOfStringsListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnEdit(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnEdit__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxBoolListValidator::OnDoubleClick(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDoubleClick__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyListView::OnCheck(wxCommandEvent&)
-      OnCheck__18wxPropertyListViewFR14wxCommandEvent
-      __vft22wxIntegerListValidator8wxObject
-      ;wxPropertyListPanel::ProcessEvent(wxEvent&)
-      ProcessEvent__19wxPropertyListPanelFR7wxEvent
-      ;wxPropertyListView::OnValueListSelect(wxCommandEvent&)
-      OnValueListSelect__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::OnText(wxCommandEvent&)
-      OnText__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent&)
-      OnStrings__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListView::OnOk(wxCommandEvent&)
-      OnOk__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyListView::OnHelp(wxCommandEvent&)
-      OnHelp__18wxPropertyListViewFR14wxCommandEvent
-      ;wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent&)
-      OnCancel__32wxPropertyStringListEditorDialogFR14wxCommandEvent
-      ;wxPropertyListFrame::sm_eventTableEntries
-      sm_eventTableEntries__19wxPropertyListFrame
-      ;wxPropertyListFrame::sm_eventTable
-      sm_eventTable__19wxPropertyListFrame
-      ;wxPropertyListView::GetEventTable() const
-      GetEventTable__18wxPropertyListViewCFv
-      ;wxConstructorForwxRealListValidator()
-      wxConstructorForwxRealListValidator__Fv
-      ;wxConstructorForwxPropertyListPanel()
-      wxConstructorForwxPropertyListPanel__Fv
-      ;wxConstructorForwxColourListValidator()
-      wxConstructorForwxColourListValidator__Fv
-      ;wxStringListValidator::sm_classwxStringListValidator
-      sm_classwxStringListValidator__21wxStringListValidator
-      ;wxPropertyListValidator::sm_classwxPropertyListValidator
-      sm_classwxPropertyListValidator__23wxPropertyListValidator
-      ;wxPropertyListPanel::~wxPropertyListPanel()
-      __dt__19wxPropertyListPanelFv
-      ;wxPropertyListView::~wxPropertyListView()
-      __dt__18wxPropertyListViewFv
-      ;wxBoolListValidator::OnDisplayValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnDisplayValue__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxPropertyStringListEditorDialog::sm_eventTable
-      sm_eventTable__32wxPropertyStringListEditorDialog
-      ;wxPropertyListView::sm_eventTableEntries
-      sm_eventTableEntries__18wxPropertyListView
-      ;wxBoolListValidator::OnPrepareDetailControls(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnPrepareDetailControls__19wxBoolListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxFilenameListValidator::OnEdit(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnEdit__23wxFilenameListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxColourListValidator::OnCheckValue(wxProperty*,wxPropertyListView*,wxWindow*)
-      OnCheckValue__21wxColourListValidatorFP10wxPropertyP18wxPropertyListViewP8wxWindow
-      ;wxListOfStringsListValidator::EditStringList(wxWindow*,wxStringList*,const char*)
-      EditStringList__28wxListOfStringsListValidatorFP8wxWindowP12wxStringListPCc
   ;From object file:  ..\generic\sashwin.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSashWindow::OnSize(wxSizeEvent&)
@@ -9715,67 +9032,82 @@ EXPORTS
       sm_classwxSashWindow__12wxSashWindow
       ;wxSashWindow::sm_eventTableEntries
       sm_eventTableEntries__12wxSashWindow
-  ;From object file:  ..\generic\scrolwin.cpp
+  ;From object file:  ..\generic\scrlwing.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxGenericScrolledWindow::OnChar(wxKeyEvent&)
-      OnChar__23wxGenericScrolledWindowFR10wxKeyEvent
+      ;wxScrollHelper::SendAutoScrollEvents(wxScrollWinEvent&) const
+      SendAutoScrollEvents__14wxScrollHelperCFR16wxScrollWinEvent
       __vft23wxGenericScrolledWindow8wxObject
-      ;wxGenericScrolledWindow::GetVirtualSize(int*,int*) const
-      GetVirtualSize__23wxGenericScrolledWindowCFPiT1
-      ;wxGenericScrolledWindow::sm_eventTable
-      sm_eventTable__23wxGenericScrolledWindow
-      ;wxGenericScrolledWindow::OnScroll(wxScrollWinEvent&)
-      OnScroll__23wxGenericScrolledWindowFR16wxScrollWinEvent
-      ;wxGenericScrolledWindow::OnSize(wxSizeEvent&)
-      OnSize__23wxGenericScrolledWindowFR11wxSizeEvent
-      ;wxGenericScrolledWindow::CalcScrollInc(wxScrollWinEvent&)
-      CalcScrollInc__23wxGenericScrolledWindowFR16wxScrollWinEvent
-      ;wxGenericScrolledWindow::Scroll(int,int)
-      Scroll__23wxGenericScrolledWindowFiT1
-      ;wxGenericScrolledWindow::GetViewStart(int*,int*) const
-      GetViewStart__23wxGenericScrolledWindowCFPiT1
-      ;wxGenericScrolledWindow::EnableScrolling(unsigned long,unsigned long)
-      EnableScrolling__23wxGenericScrolledWindowFUlT1
+      ;wxScrollHelper::EnableScrolling(unsigned long,unsigned long)
+      EnableScrolling__14wxScrollHelperFUlT1
+      ;wxAutoScrollTimer::Notify()
+      Notify__17wxAutoScrollTimerFv
+      ;wxScrollHelper::wxScrollHelper(wxWindow*)
+      __ct__14wxScrollHelperFP8wxWindow
+      ;wxAutoScrollTimer::wxAutoScrollTimer(wxWindow*,wxScrollHelper*,int,int,int)
+      __ct__17wxAutoScrollTimerFP8wxWindowP14wxScrollHelperiN23
+      ;wxScrollHelper::HandleOnScroll(wxScrollWinEvent&)
+      HandleOnScroll__14wxScrollHelperFR16wxScrollWinEvent
+      __vft17wxAutoScrollTimer8wxObject
+      ;wxScrollHelper::CalcScrollInc(wxScrollWinEvent&)
+      CalcScrollInc__14wxScrollHelperFR16wxScrollWinEvent
+      ;wxScrollHelper::GetScrollPixelsPerUnit(int*,int*) const
+      GetScrollPixelsPerUnit__14wxScrollHelperCFPiT1
+      ;wxScrollHelper::Scroll(int,int)
+      Scroll__14wxScrollHelperFiT1
+      ;wxScrollHelper::~wxScrollHelper()
+      __dt__14wxScrollHelperFv
       ;wxConstructorForwxGenericScrolledWindow()
       wxConstructorForwxGenericScrolledWindow__Fv
-      ;wxGenericScrolledWindow::PrepareDC(wxDC&)
-      PrepareDC__23wxGenericScrolledWindowFR4wxDC
-      ;wxGenericScrolledWindow::sm_eventTableEntries
-      sm_eventTableEntries__23wxGenericScrolledWindow
-      ;wxGenericScrolledWindow::CalcUnscrolledPosition(int,int,int*,int*) const
-      CalcUnscrolledPosition__23wxGenericScrolledWindowCFiT1PiT3
-      ;wxGenericScrolledWindow::SetScrollbars(int,int,int,int,int,int,unsigned long)
-      SetScrollbars__23wxGenericScrolledWindowFiN51Ul
-      ;wxGenericScrolledWindow::GetEventTable() const
-      GetEventTable__23wxGenericScrolledWindowCFv
+      __vft23wxGenericScrolledWindow14wxScrollHelper
+      ;wxScrollHelper::StopAutoScrolling()
+      StopAutoScrolling__14wxScrollHelperFv
+      ;wxScrollHelper::AdjustScrollbars()
+      AdjustScrollbars__14wxScrollHelperFv
+      ;wxScrollHelper::HandleOnPaint(wxPaintEvent&)
+      HandleOnPaint__14wxScrollHelperFR12wxPaintEvent
+      ;wxScrollHelper::HandleOnSize(wxSizeEvent&)
+      HandleOnSize__14wxScrollHelperFR11wxSizeEvent
+      ;wxScrollHelper::GetVirtualSize(int*,int*) const
+      GetVirtualSize__14wxScrollHelperCFPiT1
+      ;wxScrollHelper::GetTargetWindow() const
+      GetTargetWindow__14wxScrollHelperCFv
+      __vft14wxScrollHelper
       ;wxGenericScrolledWindow::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
       Create__23wxGenericScrolledWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
-      ;wxGenericScrolledWindow::SetTargetWindow(wxWindow*)
-      SetTargetWindow__23wxGenericScrolledWindowFP8wxWindow
-      ;wxGenericScrolledWindow::CalcScrolledPosition(int,int,int*,int*) const
-      CalcScrolledPosition__23wxGenericScrolledWindowCFiT1PiT3
-      ;wxGenericScrolledWindow::GetScrollPageSize(int) const
-      GetScrollPageSize__23wxGenericScrolledWindowCFi
-      ;wxGenericScrolledWindow::SetScrollPageSize(int,int)
-      SetScrollPageSize__23wxGenericScrolledWindowFiT1
+      ;wxScrollHelper::CalcUnscrolledPosition(int,int,int*,int*) const
+      CalcUnscrolledPosition__14wxScrollHelperCFiT1PiT3
+      ;wxScrollHelper::CalcScrolledPosition(int,int,int*,int*) const
+      CalcScrolledPosition__14wxScrollHelperCFiT1PiT3
+      ;wxScrollHelper::HandleOnMouseEnter(wxMouseEvent&)
+      HandleOnMouseEnter__14wxScrollHelperFR12wxMouseEvent
+      ;wxScrollHelper::HandleOnMouseLeave(wxMouseEvent&)
+      HandleOnMouseLeave__14wxScrollHelperFR12wxMouseEvent
+      ;wxScrollHelper::HandleOnChar(wxKeyEvent&)
+      HandleOnChar__14wxScrollHelperFR10wxKeyEvent
+      ;wxScrollHelper::SetScrollPageSize(int,int)
+      SetScrollPageSize__14wxScrollHelperFiT1
+      ;wxScrollHelper::GetViewStart(int*,int*) const
+      GetViewStart__14wxScrollHelperCFPiT1
       ;wxGenericScrolledWindow::~wxGenericScrolledWindow()
       __dt__23wxGenericScrolledWindowFv
+      ;wxScrollHelper::SetTargetWindow(wxWindow*)
+      SetTargetWindow__14wxScrollHelperFP8wxWindow
       ;wxScrolledWindow::sm_classwxScrolledWindow
       sm_classwxScrolledWindow__16wxScrolledWindow
-      ;wxGenericScrolledWindow::OnPaint(wxPaintEvent&)
-      OnPaint__23wxGenericScrolledWindowFR12wxPaintEvent
-      ;wxGenericScrolledWindow::OnMouseWheel(wxMouseEvent&)
-      OnMouseWheel__23wxGenericScrolledWindowFR12wxMouseEvent
-      ;wxGenericScrolledWindow::GetScrollPixelsPerUnit(int*,int*) const
-      GetScrollPixelsPerUnit__23wxGenericScrolledWindowCFPiT1
-      ;wxGenericScrolledWindow::wxGenericScrolledWindow()
-      __ct__23wxGenericScrolledWindowFv
-      ;wxGenericScrolledWindow::GetTargetWindow()
-      GetTargetWindow__23wxGenericScrolledWindowFv
-      ;wxGenericScrolledWindow::AdjustScrollbars()
-      AdjustScrollbars__23wxGenericScrolledWindowFv
+      ;wxScrollHelper::DoPrepareDC(wxDC&)
+      DoPrepareDC__14wxScrollHelperFR4wxDC
+      ;wxScrollHelperEvtHandler::ProcessEvent(wxEvent&)
+      ProcessEvent__24wxScrollHelperEvtHandlerFR7wxEvent
+      __vft24wxScrollHelperEvtHandler8wxObject
+      ;wxScrollHelper::SetScrollbars(int,int,int,int,int,int,unsigned long)
+      SetScrollbars__14wxScrollHelperFiN51Ul
+      ;wxScrollHelper::GetScrollPageSize(int) const
+      GetScrollPageSize__14wxScrollHelperCFi
+      ;wxScrollHelper::SetWindow(wxWindow*)
+      SetWindow__14wxScrollHelperFP8wxWindow
       ;wxGenericScrolledWindow::sm_classwxGenericScrolledWindow
       sm_classwxGenericScrolledWindow__23wxGenericScrolledWindow
+  ;From object file:  ..\generic\spinctlg.cpp
   ;From object file:  ..\generic\splitter.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSplitterWindow::OnSize(wxSizeEvent&)
@@ -10316,6 +9648,7 @@ EXPORTS
       DrawDropEffect__17wxGenericTreeCtrlFP17wxGenericTreeItem
       ;wxTreeRenameTimer::Notify()
       Notify__17wxTreeRenameTimerFv
+      __vft17wxGenericTreeCtrl14wxScrollHelper
       ;wxGenericTreeCtrl::UnselectAll()
       UnselectAll__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetItemTextColour(const wxTreeItemId&,const wxColour&)
@@ -10330,60 +9663,6 @@ EXPORTS
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp
   ;From object file:  ..\generic\wizard.cpp
-    ;PUBDEFs (Symbols available from object file):
-      ;wxWizard::wxWizard(wxWindow*,int,const wxString&,const wxBitmap&,const wxPoint&)
-      __ct__8wxWizardFP8wxWindowiRC8wxStringRC8wxBitmapRC7wxPoint
-      __vft8wxWizard8wxObject
-      ;wxWizard::OnCancel(wxCommandEvent&)
-      OnCancel__8wxWizardFR14wxCommandEvent
-      ;wxWizard::SetPageSize(const wxSize&)
-      SetPageSize__8wxWizardFRC6wxSize
-      ;wxWizard::RunWizard(wxWizardPage*)
-      RunWizard__8wxWizardFP12wxWizardPage
-      ;wxWizard::GetEventTable() const
-      GetEventTable__8wxWizardCFv
-      ;wxConstructorForwxWizardPageSimple()
-      wxConstructorForwxWizardPageSimple__Fv
-      ;wxWizard::GetPageSize() const
-      GetPageSize__8wxWizardCFv
-      wxEVT_WIZARD_PAGE_CHANGING
-      ;wxWizard::OnBackOrNext(wxCommandEvent&)
-      OnBackOrNext__8wxWizardFR14wxCommandEvent
-      ;wxWizardPageSimple::sm_classwxWizardPageSimple
-      sm_classwxWizardPageSimple__18wxWizardPageSimple
-      ;wxWizardPageSimple::GetPrev() const
-      GetPrev__18wxWizardPageSimpleCFv
-      ;wxWizardEvent::sm_classwxWizardEvent
-      sm_classwxWizardEvent__13wxWizardEvent
-      wxEVT_WIZARD_CANCEL
-      ;wxConstructorForwxWizard()
-      wxConstructorForwxWizard__Fv
-      ;wxConstructorForwxWizardEvent()
-      wxConstructorForwxWizardEvent__Fv
-      ;wxWizardPageSimple::GetNext() const
-      GetNext__18wxWizardPageSimpleCFv
-      ;wxWizard::sm_classwxWizard
-      sm_classwxWizard__8wxWizard
-      wxEVT_WIZARD_PAGE_CHANGED
-      ;wxWizard::sm_eventTable
-      sm_eventTable__8wxWizard
-      ;wxWizard::sm_eventTableEntries
-      sm_eventTableEntries__8wxWizard
-      ;wxWizard::DoCreateControls()
-      DoCreateControls__8wxWizardFv
-      ;wxWizard::GetCurrentPage() const
-      GetCurrentPage__8wxWizardCFv
-      ;wxWizardPage::wxWizardPage(wxWizard*,const wxBitmap&)
-      __ct__12wxWizardPageFP8wxWizardRC8wxBitmap
-      __vft18wxWizardPageSimple8wxObject
-      ;wxWizardEvent::wxWizardEvent(int,int,unsigned long)
-      __ct__13wxWizardEventFiT1Ul
-      ;wxWizard::ShowPage(wxWizardPage*,unsigned long)
-      ShowPage__8wxWizardFP12wxWizardPageUl
-      ;wxWizardBase::Create(wxWindow*,int,const wxString&,const wxBitmap&,const wxPoint&,const wxSize&)
-      Create__12wxWizardBaseFP8wxWindowiRC8wxStringRC8wxBitmapRC7wxPointRC6wxSize
-      ;wxWizardPage::sm_classwxWizardPage
-      sm_classwxWizardPage__12wxWizardPage
   ;From object file:  ..\html\helpctrl.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlHelpController::DisplayTextPopup(const wxString&,const wxPoint&)
@@ -10681,16 +9960,31 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxHtmlParser::DoneParser()
       DoneParser__12wxHtmlParserFv
+      ;wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
+      __dt__20wxHtmlEntitiesParserFv
+      ;wxHtmlEntitiesParser::GetEntityChar(const wxString&)
+      GetEntityChar__20wxHtmlEntitiesParserFRC8wxString
+      __vft20wxHtmlEntitiesParser8wxObject
       ;wxHtmlParser::AddTagHandler(wxHtmlTagHandler*)
       AddTagHandler__12wxHtmlParserFP16wxHtmlTagHandler
       ;wxHtmlParser::SetSource(const wxString&)
       SetSource__12wxHtmlParserFRC8wxString
-      ;wxHtmlParser::PopTagHandler()
-      PopTagHandler__12wxHtmlParserFv
+      ;wxHtmlParser::wxHtmlParser()
+      __ct__12wxHtmlParserFv
+      ;wxConstructorForwxHtmlEntitiesParser()
+      wxConstructorForwxHtmlEntitiesParser__Fv
       ;wxHtmlTagHandler::sm_classwxHtmlTagHandler
       sm_classwxHtmlTagHandler__16wxHtmlTagHandler
+      ;wxHtmlParser::PopTagHandler()
+      PopTagHandler__12wxHtmlParserFv
       ;wxHtmlParser::PushTagHandler(wxHtmlTagHandler*,wxString)
       PushTagHandler__12wxHtmlParserFP16wxHtmlTagHandler8wxString
+      ;wxHtmlEntitiesParser::SetEncoding(wxFontEncoding)
+      SetEncoding__20wxHtmlEntitiesParserF14wxFontEncoding
+      ;wxHtmlEntitiesParser::Parse(const wxString&)
+      Parse__20wxHtmlEntitiesParserFRC8wxString
+      ;wxHtmlEntitiesParser::GetCharForCode(unsigned int)
+      GetCharForCode__20wxHtmlEntitiesParserFUi
       ;wxHtmlParser::~wxHtmlParser()
       __dt__12wxHtmlParserFv
       ;wxHtmlParser::AddTag(const wxHtmlTag&)
@@ -10698,8 +9992,12 @@ EXPORTS
       __vft12wxHtmlParser8wxObject
       ;wxHtmlParser::DoParsing(int,int)
       DoParsing__12wxHtmlParserFiT1
+      ;wxHtmlEntitiesParser::wxHtmlEntitiesParser()
+      __ct__20wxHtmlEntitiesParserFv
       ;wxHtmlParser::sm_classwxHtmlParser
       sm_classwxHtmlParser__12wxHtmlParser
+      ;wxHtmlEntitiesParser::sm_classwxHtmlEntitiesParser
+      sm_classwxHtmlEntitiesParser__20wxHtmlEntitiesParser
       ;wxHtmlParser::Parse(const wxString&)
       Parse__12wxHtmlParserFRC8wxString
       ;wxHtmlParser::InitParser(const wxString&)
@@ -10714,12 +10012,18 @@ EXPORTS
       __ct__15wxHtmlTagsCacheFRC8wxString
       ;wxHtmlTag::HasParam(const wxString&) const
       HasParam__9wxHtmlTagCFRC8wxString
-      ;wxHtmlTag::wxHtmlTag(const wxString&,int,int,wxHtmlTagsCache*)
-      __ct__9wxHtmlTagFRC8wxStringiT2P15wxHtmlTagsCache
       ;wxHtmlTagsCache::QueryTag(int,int*,int*)
       QueryTag__15wxHtmlTagsCacheFiPiT2
+      ;wxHtmlTag::GetParamAsInt(const wxString&,int*) const
+      GetParamAsInt__9wxHtmlTagCFRC8wxStringPi
       ;wxHtmlTagsCache::sm_classwxHtmlTagsCache
       sm_classwxHtmlTagsCache__15wxHtmlTagsCache
+      ;wxHtmlTag::wxHtmlTag(const wxString&,int,int,wxHtmlTagsCache*,wxHtmlEntitiesParser*)
+      __ct__9wxHtmlTagFRC8wxStringiT2P15wxHtmlTagsCacheP20wxHtmlEntitiesParser
+      ;wxHtmlTag::GetParamAsColour(const wxString&,wxColour*) const
+      GetParamAsColour__9wxHtmlTagCFRC8wxStringP8wxColour
+      ;wxHtmlTag::GetAllParams() const
+      GetAllParams__9wxHtmlTagCFv
       ;wxHtmlTag::sm_classwxHtmlTag
       sm_classwxHtmlTag__9wxHtmlTag
   ;From object file:  ..\html\htmlwin.cpp
@@ -10805,6 +10109,7 @@ EXPORTS
       CreateLayout__12wxHtmlWindowFv
       ;wxConstructorForwxHtmlWindow()
       wxConstructorForwxHtmlWindow__Fv
+      __vft12wxHtmlWindow14wxScrollHelper
       ;wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo&)
       OnLinkClicked__12wxHtmlWindowFRC14wxHtmlLinkInfo
       ;wxHtmlWindow::m_GlobalProcessors
@@ -11480,6 +10785,7 @@ EXPORTS
       ;wxCheckListBox::GetEventTable() const
       GetEventTable__14wxCheckListBoxCFv
       __vft18wxCheckListBoxItem12wxOwnerDrawn
+      __vft14wxCheckListBox15wxItemContainer
       ;wxCheckListBox::wxCheckListBox(wxWindow*,int,const wxPoint&,const wxSize&,int,const wxString*,long,const wxValidator&,const wxString&)
       __ct__14wxCheckListBoxFP8wxWindowiRC7wxPointRC6wxSizeT2PC8wxStringlRC11wxValidatorRC8wxString
       ;wxCheckListBox::Check(unsigned int,unsigned long)
@@ -11529,6 +10835,7 @@ EXPORTS
       DoSetSize__8wxChoiceFiN41
       ;wxChoice::DoGetBestSize() const
       DoGetBestSize__8wxChoiceCFv
+      __vft8wxChoice15wxItemContainer
       ;wxChoice::DoAppend(const wxString&)
       DoAppend__8wxChoiceFRC8wxString
       ;wxChoice::OS2Command(unsigned int,unsigned short)
@@ -12377,95 +11684,95 @@ EXPORTS
       FromString__20wxNativeEncodingInfoFRC8wxString
   ;From object file:  ..\os2\frame.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxFrame::Show(unsigned long)
-      Show__7wxFrameFUl
-      ;wxFrame::Iconize(unsigned long)
-      Iconize__7wxFrameFUl
-      ;wxFrame::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
-      HandleMenuSelect__7wxFrameFUsT1Ul
-      ;wxFrame::OS2TranslateMessage(void**)
-      OS2TranslateMessage__7wxFrameFPPv
-      ;wxFrame::HandlePaint()
-      HandlePaint__7wxFrameFv
-      ;wxFrame::OnCreateStatusBar(int,long,int,const wxString&)
-      OnCreateStatusBar__7wxFrameFilT1RC8wxString
-      ;wxFrame::OnActivate(wxActivateEvent&)
-      OnActivate__7wxFrameFR15wxActivateEvent
-      __vft7wxFrame8wxObject
-      ;wxFrame::DoSetClientSize(int,int)
-      DoSetClientSize__7wxFrameFiT1
-      ;wxFrame::HandleSize(int,int,unsigned int)
-      HandleSize__7wxFrameFiT1Ui
-      ;wxConstructorForwxFrame()
-      wxConstructorForwxFrame__Fv
-      ;wxFrame::SetIcon(const wxIcon&)
-      SetIcon__7wxFrameFRC6wxIcon
-      ;wxFrame::Restore()
-      Restore__7wxFrameFv
-      ;wxFrame::IsMaximized() const
-      IsMaximized__7wxFrameCFv
-      ;wxFrame::IsIconized() const
-      IsIconized__7wxFrameCFv
-      ;wxFrame::GetClientAreaOrigin() const
-      GetClientAreaOrigin__7wxFrameCFv
-      ;wxFrame::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
-      Create__7wxFrameFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
-      ;wxFrame::OnSysColourChanged(wxSysColourChangedEvent&)
-      OnSysColourChanged__7wxFrameFR23wxSysColourChangedEvent
-      ;wxFrame::ShowFullScreen(unsigned long,long)
-      ShowFullScreen__7wxFrameFUll
-      ;wxFrame::DoShowWindow(int)
-      DoShowWindow__7wxFrameFi
-      ;wxFrame::sm_eventTable
-      sm_eventTable__7wxFrame
-      ;wxFrame::sm_eventTableEntries
-      sm_eventTableEntries__7wxFrame
-      ;wxFrame::sm_classwxFrame
-      sm_classwxFrame__7wxFrame
-      ;wxFrame::m_bUseNativeStatusBar
-      m_bUseNativeStatusBar__7wxFrame
-      ;wxFrame::~wxFrame()
-      __dt__7wxFrameFv
-      ;wxFrame::GetClient()
-      GetClient__7wxFrameFv
-      ;wxFrame::OS2Create(int,wxWindow*,const char*,wxWindow*,const char*,int,int,int,int,long)
-      OS2Create__7wxFrameFiP8wxWindowPCcT2T3N41l
-      ;wxFrame::HandleCommand(unsigned short,unsigned short,unsigned long)
-      HandleCommand__7wxFrameFUsT1Ul
-      ;wxFrame::DoGetSize(int*,int*) const
-      DoGetSize__7wxFrameCFPiT1
-      ;wxFrame::DoGetPosition(int*,int*) const
-      DoGetPosition__7wxFrameCFPiT1
-      ;wxFrame::PositionStatusBar()
-      PositionStatusBar__7wxFrameFv
-      ;wxFrame::PositionToolBar()
-      PositionToolBar__7wxFrameFv
-      ;wxFrame::OS2WindowProc(unsigned int,void*,void*)
-      OS2WindowProc__7wxFrameFUiPvT2
-      ;wxFrame::InternalSetMenuBar()
-      InternalSetMenuBar__7wxFrameFv
-      ;wxFrame::CreateToolBar(long,int,const wxString&)
-      CreateToolBar__7wxFrameFliRC8wxString
-      ;wxFrame::Maximize(unsigned long)
-      Maximize__7wxFrameFUl
-      ;wxFrame::SetClient(unsigned long)
-      SetClient__7wxFrameFUl
-      ;wxFrame::IconizeChildFrames(unsigned long)
-      IconizeChildFrames__7wxFrameFUl
-      ;wxFrame::DoGetClientSize(int*,int*) const
-      DoGetClientSize__7wxFrameCFPiT1
-      ;wxFrame::Init()
-      Init__7wxFrameFv
-      ;wxFrame::SetMenuBar(wxMenuBar*)
-      SetMenuBar__7wxFrameFP9wxMenuBar
-      ;wxFrame::GetEventTable() const
-      GetEventTable__7wxFrameCFv
-      ;wxFrame::DetachMenuBar()
-      DetachMenuBar__7wxFrameFv
-      wxFrameMainWndProc
+      ;wxFrameOS2::OS2Create(int,wxWindow*,const char*,wxWindow*,const char*,int,int,int,int,long)
+      OS2Create__10wxFrameOS2FiP8wxWindowPCcT2T3N41l
+      ;wxFrameOS2::OnActivate(wxActivateEvent&)
+      OnActivate__10wxFrameOS2FR15wxActivateEvent
+      ;wxFrameOS2::Iconize(unsigned long)
+      Iconize__10wxFrameOS2FUl
+      ;wxFrameOS2::DoSetClientSize(int,int)
+      DoSetClientSize__10wxFrameOS2FiT1
+      ;wxFrameOS2::HandleSize(int,int,unsigned int)
+      HandleSize__10wxFrameOS2FiT1Ui
+      ;wxFrameOS2::Restore()
+      Restore__10wxFrameOS2Fv
+      ;wxFrameOS2::sm_eventTableEntries
+      sm_eventTableEntries__10wxFrameOS2
+      ;wxFrameOS2::m_bUseNativeStatusBar
+      m_bUseNativeStatusBar__10wxFrameOS2
+      ;wxFrameOS2::IsIconized() const
+      IsIconized__10wxFrameOS2CFv
+      ;wxFrameOS2::HandlePaint()
+      HandlePaint__10wxFrameOS2Fv
+      ;wxFrameOS2::DetachMenuBar()
+      DetachMenuBar__10wxFrameOS2Fv
+      ;wxFrameOS2::CreateToolBar(long,int,const wxString&)
+      CreateToolBar__10wxFrameOS2FliRC8wxString
+      ;wxFrameOS2::Maximize(unsigned long)
+      Maximize__10wxFrameOS2FUl
+      ;wxFrameOS2::OnSysColourChanged(wxSysColourChangedEvent&)
+      OnSysColourChanged__10wxFrameOS2FR23wxSysColourChangedEvent
+      ;wxFrameOS2::HandleMenuSelect(unsigned short,unsigned short,unsigned long)
+      HandleMenuSelect__10wxFrameOS2FUsT1Ul
+      ;wxFrameOS2::HandleCommand(unsigned short,unsigned short,unsigned long)
+      HandleCommand__10wxFrameOS2FUsT1Ul
+      ;wxFrameOS2::DoGetClientSize(int*,int*) const
+      DoGetClientSize__10wxFrameOS2CFPiT1
+      ;wxFrameOS2::DoGetSize(int*,int*) const
+      DoGetSize__10wxFrameOS2CFPiT1
+      ;wxFrameOS2::~wxFrameOS2()
+      __dt__10wxFrameOS2Fv
+      ;wxFrameOS2::InternalSetMenuBar()
+      InternalSetMenuBar__10wxFrameOS2Fv
+      ;wxFrameOS2::GetClient()
+      GetClient__10wxFrameOS2Fv
+      ;wxFrameOS2::SetClient(wxWindow*)
+      SetClient__10wxFrameOS2FP8wxWindow
+      ;wxFrameOS2::ShowFullScreen(unsigned long,long)
+      ShowFullScreen__10wxFrameOS2FUll
+      ;wxFrameOS2::SetClient(unsigned long)
+      SetClient__10wxFrameOS2FUl
+      ;wxFrameOS2::IconizeChildFrames(unsigned long)
+      IconizeChildFrames__10wxFrameOS2FUl
+      ;wxFrameOS2::GetEventTable() const
+      GetEventTable__10wxFrameOS2CFv
+      ;wxFrameOS2::SetMenuBar(wxMenuBar*)
+      SetMenuBar__10wxFrameOS2FP9wxMenuBar
+      ;wxFrameOS2::PositionStatusBar()
+      PositionStatusBar__10wxFrameOS2Fv
+      ;wxFrameOS2::OS2WindowProc(unsigned int,void*,void*)
+      OS2WindowProc__10wxFrameOS2FUiPvT2
+      ;wxFrameOS2::OS2TranslateMessage(void**)
+      OS2TranslateMessage__10wxFrameOS2FPPv
+      ;wxFrameOS2::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxString&)
+      Create__10wxFrameOS2FP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelT3
+      ;wxFrameOS2::Show(unsigned long)
+      Show__10wxFrameOS2FUl
+      __vft10wxFrameOS28wxObject
+      ;wxFrameOS2::DoShowWindow(int)
+      DoShowWindow__10wxFrameOS2Fi
+      ;wxFrameOS2::Init()
+      Init__10wxFrameOS2Fv
+      ;wxFrameOS2::sm_eventTable
+      sm_eventTable__10wxFrameOS2
+      ;wxFrameOS2::sm_classwxFrameOS2
+      sm_classwxFrameOS2__10wxFrameOS2
+      ;wxFrameOS2::DoGetPosition(int*,int*) const
+      DoGetPosition__10wxFrameOS2CFPiT1
+      ;wxConstructorForwxFrameOS2()
+      wxConstructorForwxFrameOS2__Fv
+      ;wxFrameOS2::SetIcon(const wxIcon&)
+      SetIcon__10wxFrameOS2FRC6wxIcon
+      ;wxFrameOS2::PositionToolBar()
+      PositionToolBar__10wxFrameOS2Fv
+      ;wxFrameOS2::IsMaximized() const
+      IsMaximized__10wxFrameOS2CFv
+      ;wxFrameOS2::GetClientAreaOrigin() const
+      GetClientAreaOrigin__10wxFrameOS2CFv
+      ;wxFrameOS2::OnCreateStatusBar(int,long,int,const wxString&)
+      OnCreateStatusBar__10wxFrameOS2FilT1RC8wxString
       wxFrameWndProc
-      ;wxFrame::SetClient(wxWindow*)
-      SetClient__7wxFrameFP8wxWindow
+      wxFrameMainWndProc
   ;From object file:  ..\os2\gauge.cpp
     ;PUBDEFs (Symbols available from object file):
       __vft7wxGauge8wxObject
@@ -12858,6 +12165,7 @@ EXPORTS
       DoSetItemClientObject__9wxListBoxFiP12wxClientData
       ;wxListBox::GetCount() const
       GetCount__9wxListBoxCFv
+      __vft9wxListBox15wxItemContainer
       ;wxListBoxItem::wxListBoxItem(const wxString&)
       __ct__13wxListBoxItemFRC8wxString
       ;wxListBox::SetSelection(int,unsigned long)
@@ -13038,8 +12346,6 @@ EXPORTS
       sm_classwxMenuBar__9wxMenuBar
       ;wxMenuBar::RebuildAccelTable()
       RebuildAccelTable__9wxMenuBarFv
-      ;wxMenu::Detach()
-      Detach__6wxMenuFv
       ;wxMenu::OS2Command(unsigned int,unsigned short)
       OS2Command__6wxMenuFUiUs
       ;wxMenuBar::EnableTop(unsigned int,unsigned long)
@@ -13056,8 +12362,6 @@ EXPORTS
       GetWindow__6wxMenuCFv
       ;wxMenuBar::Create()
       Create__9wxMenuBarFv
-      ;wxMenu::ProcessCommand(wxCommandEvent&)
-      ProcessCommand__6wxMenuFR14wxCommandEvent
       ;wxMenuBar::FindMenuItem(const wxString&,const wxString&) const
       FindMenuItem__9wxMenuBarCFRC8wxStringT1
       ;wxConstructorForwxMenuBar()
@@ -13070,8 +12374,6 @@ EXPORTS
       Init__9wxMenuBarFv
       ;wxMenu::Break()
       Break__6wxMenuFv
-      ;wxMenu::Attach(wxMenuBar*)
-      Attach__6wxMenuFP9wxMenuBar
       ;wxMenuBar::Replace(unsigned int,wxMenu*,const wxString&)
       Replace__9wxMenuBarFUiP6wxMenuRC8wxString
   ;From object file:  ..\os2\menuitem.cpp
@@ -13101,8 +12403,6 @@ EXPORTS
       __dt__10wxMenuItemFv
       ;wxMenuItem::Enable(unsigned long)
       Enable__10wxMenuItemFUl
-      ;wxMenuItem::GetAccel() const
-      GetAccel__10wxMenuItemCFv
       __vft10wxMenuItem12wxOwnerDrawn
   ;From object file:  ..\os2\metafile.cpp
     ;PUBDEFs (Symbols available from object file):
@@ -13476,6 +12776,8 @@ EXPORTS
       GetSize__10wxRadioBoxCFPiT1
       ;wxRadioBox::GetPosition(int*,int*) const
       GetPosition__10wxRadioBoxCFPiT1
+      ;wxRadioBox::GetColumnCount() const
+      GetColumnCount__10wxRadioBoxCFv
       ;wxRadioBox::SetFocus()
       SetFocus__10wxRadioBoxFv
       ;wxRadioBox::OS2Command(unsigned int,unsigned short)
@@ -13484,12 +12786,15 @@ EXPORTS
       SetLabel__10wxRadioBoxFiP8wxBitmap
       ;wxRadioBox::SubclassRadioButton(unsigned long)
       SubclassRadioButton__10wxRadioBoxFUl
+      __vft10wxRadioBox14wxRadioBoxBase
       ;wxConstructorForwxRadioBox()
       wxConstructorForwxRadioBox__Fv
       ;wxRadioBox::wxRadioBox()
       __ct__10wxRadioBoxFv
       ;wxRadioBox::SendNotificationEvent()
       SendNotificationEvent__10wxRadioBoxFv
+      ;wxRadioBox::GetRowCount() const
+      GetRowCount__10wxRadioBoxCFv
       ;wxRadioBox::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,int,const wxString*,int,long,const wxValidator&,const wxString&)
       Create__10wxRadioBoxFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizeT2PC8wxStringT2lRC11wxValidatorT3
       ;wxRadioBox::FindString(const wxString&) const
@@ -13499,10 +12804,12 @@ EXPORTS
       __vft10wxRadioBox8wxObject
       ;wxRadioBox::SetSelection(int)
       SetSelection__10wxRadioBoxFi
-      ;wxRadioBox::GetNumVer() const
-      GetNumVer__10wxRadioBoxCFv
+      ;wxRadioBox::GetCount() const
+      GetCount__10wxRadioBoxCFv
       ;wxRadioBox::~wxRadioBox()
       __dt__10wxRadioBoxFv
+      ;wxRadioBox::GetNumVer() const
+      GetNumVer__10wxRadioBoxCFv
       ;wxRadioBtnWndProc(unsigned long,unsigned int,void*,void*)
       wxRadioBtnWndProc__FUlUiPvT3
       ;wxRadioBox::Show(int,unsigned long)
@@ -13513,12 +12820,12 @@ EXPORTS
       DoSetSize__10wxRadioBoxFiN41
       ;wxRadioBox::GetNumHor() const
       GetNumHor__10wxRadioBoxCFv
+      ;wxRadioBox::SetString(int,const wxString&)
+      SetString__10wxRadioBoxFiRC8wxString
       ;wxRadioBox::SetLabel(int,const wxString&)
       SetLabel__10wxRadioBoxFiRC8wxString
   ;From object file:  ..\os2\radiobut.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxBitmapRadioButton::GetValue() const
-      GetValue__19wxBitmapRadioButtonCFv
       ;wxRadioButton::sm_classwxRadioButton
       sm_classwxRadioButton__13wxRadioButton
       ;wxRadioButton::OS2Command(unsigned int,unsigned short)
@@ -13527,26 +12834,15 @@ EXPORTS
       wxConstructorForwxRadioButton__Fv
       ;wxRadioButton::Command(wxCommandEvent&)
       Command__13wxRadioButtonFR14wxCommandEvent
-      ;wxBitmapRadioButton::SetValue(unsigned long)
-      SetValue__19wxBitmapRadioButtonFUl
-      ;wxBitmapRadioButton::sm_classwxBitmapRadioButton
-      sm_classwxBitmapRadioButton__19wxBitmapRadioButton
-      ;wxBitmapRadioButton::SetLabel(const wxBitmap*)
-      SetLabel__19wxBitmapRadioButtonFPC8wxBitmap
       __vft13wxRadioButton8wxObject
-      ;wxConstructorForwxBitmapRadioButton()
-      wxConstructorForwxBitmapRadioButton__Fv
       ;wxRadioButton::Create(wxWindow*,int,const wxString&,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__13wxRadioButtonFP8wxWindowiRC8wxStringRC7wxPointRC6wxSizelRC11wxValidatorT3
       ;wxRadioButton::SetLabel(const wxString&)
       SetLabel__13wxRadioButtonFRC8wxString
       ;wxRadioButton::SetValue(unsigned long)
       SetValue__13wxRadioButtonFUl
-      __vft19wxBitmapRadioButton8wxObject
       ;wxRadioButton::GetValue() const
       GetValue__13wxRadioButtonCFv
-      ;wxBitmapRadioButton::Create(wxWindow*,int,const wxBitmap*,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
-      Create__19wxBitmapRadioButtonFP8wxWindowiPC8wxBitmapRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
   ;From object file:  ..\os2\region.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxRegion::Combine(const wxRect&,wxRegionOp)
@@ -14344,8 +13640,6 @@ EXPORTS
       wxGetUserName__FPci
       ;wxSleep(int)
       wxSleep__Fi
-      ;wxKill(long,wxSignal,wxKillError*)
-      wxKill__Fl8wxSignalP11wxKillError
       ;wxGetResource(const wxString&,const wxString&,long*,const wxString&)
       wxGetResource__FRC8wxStringT1PlT1
       ;wxGetOsVersion(int*,int*)
@@ -14403,6 +13697,8 @@ EXPORTS
       wxGetResource__FRC8wxStringT1PiT1
       ;wxError(const wxString&,const wxString&)
       wxError__FRC8wxStringT1
+      ;wxKill(long,wxSignal,wxKillError*)
+      wxKill__Fl8wxSignalP11wxKillError
       ;wxBell()
       wxBell__Fv
       ;wxShell(const wxString&)
-- 
2.50.0

