corrected use of Print Manager Session APIs for Carbon targets

[wxWidgets.git] / src / os2 / menu.cpp

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 07327e565b438f0a1b62d203527f2ae5b23c4acd..e307253b9130661983ea2edc3274112a4e6e6cb9 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -330,7 +330,7 @@ bool wxMenu::DoInsertOrAppend(
         // Will eventually need to set the image handle somewhere into vItem.hItem
         //
         rItem.afStyle |= MIS_OWNERDRAW;
-        pData = (BYTE*)pItem;
+        pData = (BYTE*)NULL;
         rItem.hItem = (HBITMAP)pItem->GetBitmap().GetHBITMAP();
         pItem->m_vMenuData.afStyle = rItem.afStyle;
         pItem->m_vMenuData.hItem = rItem.hItem;
@@ -389,7 +389,7 @@ bool wxMenu::DoInsertOrAppend(
         //
         // If we're already attached to the menubar, we must update it
         //
-        if (IsAttached())
+        if (IsAttached() && m_menuBar->IsAttached())
         {
             m_menuBar->Refresh();
         }
@@ -460,7 +460,7 @@ wxMenuItem* wxMenu::DoRemove(
                  ,MPFROM2SHORT(pItem->GetId(), TRUE)
                  ,(MPARAM)0
                 );
-    if (IsAttached())
+    if (IsAttached() && m_menuBar->IsAttached())
     {
         //
         // Otherwise, the chane won't be visible