restoring wxUSE_GLOBAL_MEMORY_OPERATORS I accidentally removed a moment ago

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 68f3f67d084ad61bfcd42eb81e05e097c67d3ffd..a7ede6fe162cd1d48c4a14c6d9ddfe226437b169 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? */
 
+  // 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;
@@ -65,7 +69,7 @@ public:
   // 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;
@@ -120,6 +124,7 @@ public:
   wxEvtHandler *    m_parent;
   wxEvtHandler *    m_eventHandler;
   wxWindow         *m_pInvokingWindow;
+  void*             m_clientData;
 };
 
 // ----------------------------------------------------------------------------