implemented (untested) work around for wxScrolledWindow painting bug

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

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index fac76609db604e267547430ec045b95093ddb3bc..e75b73d6f05f4cc8a177ba082a1d5f0e2fa1a914 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


@@ -166,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
     //


@@ -254,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
     //


@@ -305,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


@@ -315,6 +288,8 @@ protected:
     wxAcceleratorTable              m_vAccelTable;
 #endif // wxUSE_ACCEL
 
     wxAcceleratorTable              m_vAccelTable;
 #endif // wxUSE_ACCEL
 

+    wxFrame*                        m_pMenuBarFrame;
+

 private:
     //
     // Virtual function hiding suppression
 private:
     //
     // Virtual function hiding suppression