From 3e282d337fd4e79544fba664803163b4e2850e19 Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Tue, 7 Mar 2000 21:26:54 +0000
Subject: [PATCH] no message

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/os2/menuitem.h |  5 +++++
 include/wx/os2/window.h   | 28 ++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 1d6b8879fe..4e36724c7e 100644
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -73,6 +73,11 @@ public:
     // menu handle depending on what we're
     int GetRealId(void) const;
 
+    //
+    // All OS/2PM Submenus and menus have one of these
+    //
+    MENUITEM                        m_vMenuData;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 }; // end of CLASS wxMenuItem
diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 52399a3a77..9d22bad4e7 100644
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -47,7 +47,10 @@ enum
 class WXDLLEXPORT wxWindow : public wxWindowBase
 {
 public:
-    wxWindow() { Init(); }
+    wxWindow()
+    {
+        Init();
+    }
 
     wxWindow( wxWindow*       pParent
              ,wxWindowID      vId
@@ -244,18 +247,19 @@ public:
     virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; };
 
     // returns TRUE if the window has been created
-    bool OS2Create( int           nId
-                   ,wxWindow*     pParent
-                   ,const wxChar* zWclass
-                   ,wxWindow*     pWxWin
+    bool OS2Create( WXHWND        hParent
+                   ,PSZ           zClass
                    ,const wxChar* zTitle
-                   ,int           nX
-                   ,int           nY
-                   ,int           nWidth
-                   ,int           nHeight
                    ,WXDWORD       dwStyle
-                   ,const wxChar* zDialogTemplate = NULL
-                   ,WXDWORD       dwExendedStyle = 0
+                   ,long          lX
+                   ,long          lY
+                   ,long          lWidth
+                   ,long          lHeight
+                   ,WXHWND        hOwner
+                   ,WXHWND        hZOrder
+                   ,unsigned long lId
+                   ,void*         pCtlData = NULL
+                   ,void*         pPresParams = NULL
                   );
     virtual bool OS2Command( WXUINT uParam
                             ,WXWORD nId
@@ -511,7 +515,7 @@ protected:
 
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
-    // ::MoveWindow() except for composite controls which will want to arrange
+    // ::WinSetWindowPos() except for composite controls which will want to arrange
     // themselves inside the given rectangle
     virtual void DoMoveWindow( int nX
                               ,int nY
-- 
2.47.2