From ed2b77fc4753ab9739e3f1e0c1fef7ad151a4940 Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Mon, 3 Jun 2002 14:56:27 +0000
Subject: [PATCH] Weekly OS/2 catch-up.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/os2/app.cpp  |  5 +----
 src/os2/wx23.def | 12 +++++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index f48fa2d453..909a3ce132 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -769,10 +769,7 @@ bool wxApp::DoMessage()
                 {
                     QMSG            vMsg = svSavedMessages[n];
 
-                    if ( !ProcessMessage((WXMSG *)&vMsg) )
-                    {
-                        ::WinDispatchMsg(vHabmain, &vMsg);
-                    }
+                    DoMessage((WXMSG*)&vMsg);
                 }
                 svSavedMessages.Empty();
             }
diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 84f70ef783..17e3bbfb43 100644
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
-;From library:  H:\Dev\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
@@ -5813,12 +5813,14 @@ EXPORTS
       InsertTool__13wxToolBarBaseFUiiRC8wxStringRC8wxBitmapT410wxItemKindN23P8wxObject
       ;wxToolBarBase::InsertControl(unsigned int,wxControl*)
       InsertControl__13wxToolBarBaseFUiP9wxControl
-      ;wxToolBarBase::SetMargins(int,int)
-      SetMargins__13wxToolBarBaseFiT1
+      ;wxToolBarBase::FindControl(int)
+      FindControl__13wxToolBarBaseFi
       ;wxToolBarBase::sm_eventTableEntries
       sm_eventTableEntries__13wxToolBarBase
       ;wxToolBarBase::SetRows(int)
       SetRows__13wxToolBarBaseFi
+      ;wxToolBarBase::SetMargins(int,int)
+      SetMargins__13wxToolBarBaseFiT1
       ;wxToolBarToolBase::SetLongHelp(const wxString&)
       SetLongHelp__17wxToolBarToolBaseFRC8wxString
       ;wxToolBarBase::SetToolShortHelp(int,const wxString&)
@@ -11503,12 +11505,12 @@ EXPORTS
       wxConstructorForwxAcceleratorTable__Fv
       ;wxAcceleratorTable::SetHACCEL(unsigned long)
       SetHACCEL__18wxAcceleratorTableFUl
-      ;wxAcceleratorTable::wxAcceleratorTable(int,wxAcceleratorEntry*)
-      __ct__18wxAcceleratorTableFiP18wxAcceleratorEntry
       ;wxAcceleratorTable::~wxAcceleratorTable()
       __dt__18wxAcceleratorTableFv
       ;wxAcceleratorTable::Ok() const
       Ok__18wxAcceleratorTableCFv
+      ;wxAcceleratorTable::wxAcceleratorTable(int,const wxAcceleratorEntry*)
+      __ct__18wxAcceleratorTableFiPC18wxAcceleratorEntry
       __vft20wxAcceleratorRefData15wxObjectRefData
       ;wxAcceleratorTable::wxAcceleratorTable()
       __ct__18wxAcceleratorTableFv
-- 
2.45.2