wx(Individual)LayoutConstraints may be copied

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

diff --git a/include/wx/mac/menu.h b/include/wx/mac/menu.h
index 98b840a56fd6e399c03be8b41b72c56be8cf89b4..6c39c96fc028f34c26a7c814c2e8af0e4cb3f380 100644 (file)
--- a/include/wx/mac/menu.h
+++ b/include/wx/mac/menu.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "menu.h"
 #endif
 
@@ -63,7 +63,6 @@ public:
     // implementation only from now on
     // -------------------------------
 
-       bool MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum) ;
        int     MacGetIndexFromId( int id ) ; 
        int     MacGetIndexFromItem( wxMenuItem *pItem ) ; 
        void MacEnableMenu( bool bDoEnable ) ;
@@ -74,9 +73,6 @@ public:
         // get the menu handle
     WXHMENU GetHMenu() const { return m_hMenu; }
 
-    // attach/detach menu to/from wxMenuBar
-    void Attach(wxMenuBar *menubar);
-    void Detach();
        short MacGetMenuId() { return m_macMenuId ; }
 #if wxUSE_ACCEL
     // called by wxMenuBar to build its accel table from the accels of all menus
@@ -166,6 +162,11 @@ public:
         // attach to a frame
     void Attach(wxFrame *frame);
 
+               // clear the invoking window for all menus and submenus
+       void UnsetInvokingWindow() ;
+
+               // set the invoking window for all menus and submenus
+       void SetInvokingWindow( wxFrame* frame ) ;
 #if wxUSE_ACCEL
     // get the accel table for all the menus
     const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
@@ -176,10 +177,9 @@ public:
 
     // if the menubar is modified, the display is not updated automatically,
     // call this function to update it (m_menuBarFrame should be !NULL)
-    void Refresh();
+    void Refresh(bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL);
 
   void MacInstallMenuBar() ;
-  void MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum) ;
   static wxMenuBar* MacGetInstalledMenuBar() { return s_macInstalledMenuBar ; }
 
 protected:
@@ -192,8 +192,6 @@ protected:
 
     wxArrayString m_titles;
 
-    wxFrame      *m_menuBarFrame;
-
 #if wxUSE_ACCEL
     // the accelerator table for all accelerators in all our menus
     wxAcceleratorTable m_accelTable;