Fix missing documentation for several GDI functions.

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

diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index b37bd9dae336ae78f26f39ec54bd75a8a7df9519..17f351efd6ff0c724c86a553213522b905a0bd8f 100644 (file)
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        menu.h
+// Name:        wx/osx/menu.h

 // Purpose:     wxMenu, wxMenuBar classes
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxMenu, wxMenuBar classes
 // Author:      Stefan Csomor
 // Modified by:


@@ -83,6 +83,10 @@ private:
     // terminate the current radio group, if any
     void EndRadioGroup();
 
     // terminate the current radio group, if any
     void EndRadioGroup();
 

+    // Common part of HandleMenu{Opened,Closed}().
+    void DoHandleMenuOpenedOrClosed(wxEventType evtType);
+
+

     // if TRUE, insert a breal before appending the next item
     bool m_doBreak;
 
     // if TRUE, insert a breal before appending the next item
     bool m_doBreak;
 


@@ -126,11 +130,8 @@ public:
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Remove(size_t pos);
 
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Remove(size_t pos);
 

-    virtual int FindMenuItem(const wxString& menuString,
-                             const wxString& itemString) const;
-    virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
-

     virtual void EnableTop( size_t pos, bool flag );
     virtual void EnableTop( size_t pos, bool flag );

+    virtual bool IsEnabledTop(size_t pos) const;

     virtual void SetMenuLabel( size_t pos, const wxString& label );
     virtual wxString GetMenuLabel( size_t pos ) const;
     virtual bool Enable( bool enable = true );
     virtual void SetMenuLabel( size_t pos, const wxString& label );
     virtual wxString GetMenuLabel( size_t pos ) const;
     virtual bool Enable( bool enable = true );


@@ -141,7 +142,6 @@ public:
     }
 
     // implementation from now on
     }
 
     // implementation from now on

-    int  FindMenu(const wxString& title);

     void Detach();
 
         // returns TRUE if we're attached to a frame
     void Detach();
 
         // returns TRUE if we're attached to a frame


@@ -169,7 +169,6 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    wxArrayString   m_titles;

     static bool     s_macAutoWindowMenu ;
     static WXHMENU  s_macWindowMenuHandle ;
 
     static bool     s_macAutoWindowMenu ;
     static WXHMENU  s_macWindowMenuHandle ;