From 72594e90b2da8c167ba63b89b2c168c57a19cab4 Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Fri, 5 Oct 2001 16:30:20 +0000
Subject: [PATCH] Some OS/2 updates

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

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index e960818b45..587a60a854 100644
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -609,7 +609,12 @@ wxMenuItem* wxMenu::FindItem(
         }
         else if ( pItem->IsSubMenu() )
         {
-            pItem = pItem->GetSubMenu()->FindItem(nItemId, hItem, ppItemMenu);
+            pItem = pItem->GetSubMenu()->FindItem( nItemId
+                                                  ,hItem
+                                                  ,ppItemMenu
+                                                 );
+            if (pItem)
+                break;
         }
         else
         {
diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index 94f6c92c24..bd9843acb1 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:  F:\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
@@ -1647,7 +1647,7 @@ EXPORTS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
-  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\extended.c
+  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\extended.c
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
@@ -3763,7 +3763,6 @@ EXPORTS
       __ct__11wxClassInfoFPCcN21iPFv_P8wxObject
       ;wxObject::Dump(ostream&)
       Dump__8wxObjectFR7ostream
-      wxTrue
       ;wxObject::LoadObject(wxObjectInputStream&)
       LoadObject__8wxObjectFR19wxObjectInputStream
       ;wxClassInfo::IsKindOf(const wxClassInfo*) const
@@ -5486,7 +5485,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
-  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\unzip.c
+  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\unzip.c
     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo
@@ -5562,6 +5561,8 @@ EXPORTS
       wxDecToHex__Fi
       ;wxNow()
       wxNow__Fv
+      ;wxGetInstallPrefix()
+      wxGetInstallPrefix__Fv
       ;wxWindowDisabler::~wxWindowDisabler()
       __dt__16wxWindowDisablerFv
       ;copystring(const char*)
-- 
2.50.0

