No real changes, just clean up wxAbortProc mess.

[wxWidgets.git] / include / wx / univ / menuitem.h

diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index 3601bd5fc8ba9b2522e0e3c2ab3711bdc55ec550..90da59a9fe3bff452ba14127832ebc32a2fe1a1b 100644 (file)
--- a/include/wx/univ/menuitem.h
+++ b/include/wx/univ/menuitem.h
@@ -16,16 +16,16 @@
 // wxMenuItem implements wxMenuItemBase
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMenuItem : public wxMenuItemBase
+class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
 {
 public:
     // ctor & dtor
-    wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
+    wxMenuItem(wxMenu *parentMenu = NULL,
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL);
     virtual ~wxMenuItem();
 
     // override base class virtuals to update the item appearance on screen
@@ -72,14 +72,14 @@ public:
 
     wxCoord GetPosition() const
     {
-        wxASSERT_MSG( m_posY != wxDefaultCoord, _T("must call SetHeight first!") );
+        wxASSERT_MSG( m_posY != wxDefaultCoord, wxT("must call SetHeight first!") );
 
         return m_posY;
     }
 
     wxCoord GetHeight() const
     {
-        wxASSERT_MSG( m_height != wxDefaultCoord, _T("must call SetHeight first!") );
+        wxASSERT_MSG( m_height != wxDefaultCoord, wxT("must call SetHeight first!") );
 
         return m_height;
     }