AutoSizeColumns and AutoSizeRows changed to pass FALSE for calcOnly arg

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

diff --git a/include/wx/stubs/menu.h b/include/wx/stubs/menu.h
index f663631da574dab10cb21672ad552ec22e0d21d1..db15f8fc708a0abd66ef8b56b513a4bb62fead92 100644 (file)
--- a/include/wx/stubs/menu.h
+++ b/include/wx/stubs/menu.h
@@ -52,7 +52,7 @@ public:
     // insert a break in the menu
   void Break();
     // delete an item
-  void Delete(int id); /* If it's a submenu, menu is not destroyed. VZ: why? */
+  void Delete(int id);
 
   // menu item control
   void Enable(int id, bool Flag);
@@ -62,10 +62,17 @@ public:
   bool Checked(int id) const;
   inline bool IsChecked(int id) const { return IsChecked(id); };
 
+  // Client data
+  inline void SetClientData(void* clientData) { m_clientData = clientData; }
+  inline void* GetClientData() const { return m_clientData; }
+
+  void      SetInvokingWindow(wxWindow *pWin) { m_pInvokingWindow = pWin; }
+  wxWindow *GetInvokingWindow()         const { return m_pInvokingWindow; }
+
   // item properties
     // title
   void SetTitle(const wxString& label);
-  const wxString& GetTitle() const;
+  const wxString GetTitle() const;
     // label
   void SetLabel(int id, const wxString& label);
   wxString GetLabel(int id) const;
@@ -74,7 +81,7 @@ public:
   virtual wxString GetHelpString(int id) const ;
 
   // find item
-    // Finds the item id matching the given string, NOT_FOUND if not found.
+    // Finds the item id matching the given string, -1 if not found.
   virtual int FindItem(const wxString& itemString) const ;
     // Find wxMenuItem by ID, and item's menu too if itemMenu is !NULL.
   wxMenuItem *FindItemForId(int itemId, wxMenu **itemMenu = NULL) const;
@@ -82,6 +89,12 @@ public:
   void ProcessCommand(wxCommandEvent& event);
   inline void Callback(const wxFunction func) { m_callback = func; }
 
+  // Updates the UI for a menu and all submenus recursively.
+  // source is the object that has the update event handlers
+  // defined for it. If NULL, the menu or associated window
+  // will be used.
+  void UpdateUI(wxEvtHandler* source = (wxEvtHandler*) NULL);
+
   virtual void SetParent(wxEvtHandler *parent) { m_parent = parent; }
   inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
   inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
@@ -93,11 +106,12 @@ public:
 
   int               m_noItems;
   wxString          m_title;
-  wxMenu *          m_topLevelMenu;
   wxMenuBar *       m_menuBar;
   wxList            m_menuItems;
   wxEvtHandler *    m_parent;
   wxEvtHandler *    m_eventHandler;
+  void*             m_clientData;
+  wxWindow*         m_pInvokingWindow;
 };
 
 // ----------------------------------------------------------------------------