Fixed remaining int vs. long warnings.

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

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 8ff449298fbe16a47a29ad05915dcbe3eac60995..c90a5ebbdfead3b1b641b2d0fa050e0f6d54eade 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -278,12 +278,17 @@ bool wxMenu::DoInsertOrAppend(
     //
     if (nPos == (size_t)-1)
     {
     //
     if (nPos == (size_t)-1)
     {

-        HWND                        hSubMenu = ::WinCreateWindow( GetWinHwnd(m_menuBar) // parent
+        HWND                        hMenuBar;
+        if (m_menuBar)
+            hMenuBar = GetWinHwnd(m_menuBar);
+        else
+            hMenuBar = HWND_DESKTOP;
+        HWND                        hSubMenu = ::WinCreateWindow( hMenuBar              // parent

                                                                  ,WC_MENU               // type
                                                                  ,"Menu"                // a generic name
                                                                  ,0L                    // no style flag
                                                                  ,0L,0L,0L,0L           // no position
                                                                  ,WC_MENU               // type
                                                                  ,"Menu"                // a generic name
                                                                  ,0L                    // no style flag
                                                                  ,0L,0L,0L,0L           // no position

-                                                                 ,GetWinHwnd(m_menuBar) // no owner
+                                                                 ,hMenuBar              // no owner

                                                                  ,HWND_TOP              // always on top
                                                                  ,0L                    // no ID needed for dynamic creation
                                                                  ,NULL                  // no control data
                                                                  ,HWND_TOP              // always on top
                                                                  ,0L                    // no ID needed for dynamic creation
                                                                  ,NULL                  // no control data