shows different SetCursor() calls

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index f5d0a6a1a6e798783308b5f2b150f172e6e3f3ea..33c6701ca6f837ceaeeb5dc162466327ee29a280 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -54,6 +54,10 @@ public:
     // delete an item
   void Delete(int id); /* If it's a submenu, menu is not destroyed. VZ: why? */
 
     // delete an item
   void Delete(int id); /* If it's a submenu, menu is not destroyed. VZ: why? */
 

+  // Client data
+  inline void SetClientData(void* clientData) { m_clientData = clientData; }
+  inline void* GetClientData() const { return m_clientData; }
+

   // menu item control
   void Enable(int id, bool Flag);
   bool Enabled(int id) const;
   // menu item control
   void Enable(int id, bool Flag);
   bool Enabled(int id) const;


@@ -74,11 +78,17 @@ public:
   virtual wxString GetHelpString(int id) const ;
 
   // find item
   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, wxNOT_FOUND 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;
 
   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;
 

+  // 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);
+

   void ProcessCommand(wxCommandEvent& event);
   inline void Callback(const wxFunction func) { m_callback = func; }
 
   void ProcessCommand(wxCommandEvent& event);
   inline void Callback(const wxFunction func) { m_callback = func; }
 


@@ -120,6 +130,7 @@ public:
   wxEvtHandler *    m_parent;
   wxEvtHandler *    m_eventHandler;
   wxWindow         *m_pInvokingWindow;
   wxEvtHandler *    m_parent;
   wxEvtHandler *    m_eventHandler;
   wxWindow         *m_pInvokingWindow;

+  void*             m_clientData;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -132,6 +143,7 @@ class WXDLLEXPORT wxMenuBar: public wxEvtHandler
 
 public:
   wxMenuBar();
 
 public:
   wxMenuBar();

+  wxMenuBar( long style );

   wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
   ~wxMenuBar();
 
   wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
   ~wxMenuBar();