_MSC_VER => __VISUALC__ change

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index d193d990483983cc53e6cd7d7ff68eb1986e496e..6ca343d1afef8dab7996889cc05cc8fe5eaa9acf 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -6,11 +6,11 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MENUH__
-#define __MENUH__
+#ifndef _WX_MENU_H_
+#define _WX_MENU_H_
 
 #ifdef __GNUG__
 #pragma interface "menu.h"
@@ -19,9 +19,9 @@
 #include "wx/defs.h"
 #include "wx/event.h"
 
-class wxMenuItem;
-class wxMenuBar;
-class wxMenu;
+class WXDLLEXPORT wxMenuItem;
+class WXDLLEXPORT wxMenuBar;
+class WXDLLEXPORT wxMenu;
 
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
@@ -45,7 +45,7 @@ public:
   void Append(int id, const wxString& Label, const wxString& helpString = wxEmptyString,
               bool checkable = FALSE);
       // a submenu
-  void Append(int id, const wxString& Label, wxMenu *SubMenu, 
+  void Append(int id, const wxString& Label, wxMenu *SubMenu,
               const wxString& helpString = wxEmptyString);
       // the most generic form (create wxMenuItem first and use it's functions)
   void Append(wxMenuItem *pItem);
@@ -54,18 +54,22 @@ 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;
   inline bool IsEnabled(int id) const { return Enabled(id); };
   void Check(int id, bool Flag);
   bool Checked(int id) const;
-  inline bool IsChecked(int id) const { return IsChecked(id); };
+  inline bool IsChecked(int id) const { return Checked(id); };
 
   // 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 +78,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, 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;
@@ -84,7 +88,7 @@ public:
 
   virtual void SetParent(wxEvtHandler *parent) { m_parent = parent; }
   inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
-  inline wxEvtHandler *GetEventHandler(void) { return m_eventHandler; }
+  inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
 
   inline wxList& GetItems() const { return (wxList&) m_menuItems; }
 
@@ -120,19 +124,21 @@ public:
   wxEvtHandler *    m_parent;
   wxEvtHandler *    m_eventHandler;
   wxWindow         *m_pInvokingWindow;
+  void*             m_clientData;
 };
 
 // ----------------------------------------------------------------------------
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
-class wxFrame;
+class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxMenuBar: public wxEvtHandler
 {
   DECLARE_DYNAMIC_CLASS(wxMenuBar)
 
-  wxMenuBar(void);
+public:
+  wxMenuBar();
   wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
-  ~wxMenuBar(void);
+  ~wxMenuBar();
 
   void Append(wxMenu *menu, const wxString& title);
   // Must only be used AFTER menu has been attached to frame,
@@ -162,7 +168,7 @@ class WXDLLEXPORT wxMenuBar: public wxEvtHandler
   wxMenuItem *FindItemForId(int itemId, wxMenu **menuForItem = NULL) const ;
 
   inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
-  inline wxEvtHandler *GetEventHandler(void) { return m_eventHandler; }
+  inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
 
   inline int GetMenuCount() const { return m_menuCount; }
   inline wxMenu* GetMenu(int i) const { return m_menus[i]; }
@@ -176,4 +182,4 @@ class WXDLLEXPORT wxMenuBar: public wxEvtHandler
   WXHMENU                   m_hMenu;
 };
 
-#endif // __MENUH__
+#endif // _WX_MENU_H_