Applied wxImage -> wxCursor patch, tool window event table fix

[wxWidgets.git] / include / wx / os2 / menu.h

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index 7b05ee3297dd99c228d898ce322279daa7a9673e..4a0baba04b8e709104f3fcee5271114a9fd1013c 100644 (file)
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -73,12 +73,6 @@ public:
     }
 #endif // wxUSE_MENU_CALLBACK
 
     }
 #endif // wxUSE_MENU_CALLBACK
 

-    //
-    // OS2-specific
-    //
-    bool ProcessCommand(wxCommandEvent& rEvent);
-
-

     //
     // Implementation only from now on
     // -------------------------------
     //
     // Implementation only from now on
     // -------------------------------


@@ -101,12 +95,6 @@ public:
     //
     WXHMENU GetHMenu() const { return m_hMenu; }
 
     //
     WXHMENU GetHMenu() const { return m_hMenu; }
 

-    //
-    // Attach/detach menu to/from wxMenuBar
-    //
-    void Attach(wxMenuBar* pMenubar);
-    void Detach(void);
-

 #if wxUSE_ACCEL
     //
     // Called by wxMenuBar to build its accel table from the accels of all menus
 #if wxUSE_ACCEL
     //
     // Called by wxMenuBar to build its accel table from the accels of all menus


@@ -125,6 +113,15 @@ public:
     //
     int FindAccel(int nId) const;
 #endif // wxUSE_ACCEL
     //
     int FindAccel(int nId) const;
 #endif // wxUSE_ACCEL

+    //
+    // OS/2 specific Find
+    //
+    wxMenuItem* FindItem(int id, ULONG hItem, wxMenu **menu = NULL) const;
+    //virtual function hiding suppression
+    int FindItem(const wxString& rsString) const
+    { return wxMenuBase::FindItem(rsString); }
+    wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const
+    { return wxMenuBase::FindItem(id, menu); }

 
     //
     // All OS/2PM Menu's have one of these
 
     //
     // All OS/2PM Menu's have one of these


@@ -157,7 +154,7 @@ private:
     //
     // The helper variable for creating unique IDs.
     //
     //
     // The helper variable for creating unique IDs.
     //

-    static USHORT                  m_nextMenuId;
+    static USHORT                          m_nextMenuId;

 
 #if wxUSE_ACCEL
     //
 
 #if wxUSE_ACCEL
     //


@@ -219,7 +216,10 @@ public:
     virtual wxMenuItem* FindItem( int      nId
                                  ,wxMenu** ppMenu = NULL
                                 ) const;
     virtual wxMenuItem* FindItem( int      nId
                                  ,wxMenu** ppMenu = NULL
                                 ) const;

-
+    virtual wxMenuItem* FindItem( int      nId
+                                 ,ULONG    hItem
+                                 ,wxMenu** ppMenu = NULL
+                                ) const;

     virtual void        EnableTop( size_t nPos
                                   ,bool   bFlag
                                  );
     virtual void        EnableTop( size_t nPos
                                   ,bool   bFlag
                                  );


@@ -242,22 +242,8 @@ public:
     // Implementation from now on
     //
     WXHMENU                   Create(void);
     // Implementation from now on
     //
     WXHMENU                   Create(void);

-    void                      Detach(void);
-
-    //
-    // Returns TRUE if we're attached to a frame
-    //
-    bool                      IsAttached(void) const { return m_pMenuBarFrame != NULL; }
-
-    //
-    // Get the frame we live in
-    //
-    wxFrame *                 GetFrame(void) const { return m_pMenuBarFrame; }
-
-    //
-    // Attach to a frame
-    //
-    void                      Attach(wxFrame* pFrame);
+    virtual void              Detach(void);
+    virtual void              Attach(wxFrame* pFrame);

 
 #if wxUSE_ACCEL
     //
 
 #if wxUSE_ACCEL
     //


@@ -293,7 +279,6 @@ protected:
 
     wxArrayString m_titles;
 
 
     wxArrayString m_titles;
 

-    wxFrame*                        m_pMenuBarFrame;

     WXHMENU                         m_hMenu;
 
 #if wxUSE_ACCEL
     WXHMENU                         m_hMenu;
 
 #if wxUSE_ACCEL