]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/os2/menu.h
Remove defined(__WXMAC__) && defined(__APPLE__) case from the OS if/elif block.
[wxWidgets.git] / include / wx / os2 / menu.h
index b871f900e424ef7ac41265a421716e834b6da35e..a4c380faa89fba6574c9601d786f1b4765c65972 100644 (file)
@@ -20,7 +20,7 @@
     WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
 #endif // wxUSE_ACCEL
 
-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
 
 void wxSetShortCutKey(wxChar* zText);
 
@@ -226,10 +226,10 @@ public:
     virtual void        EnableTop( size_t nPos
                                   ,bool   bFlag
                                  );
-    virtual void        SetLabelTop( size_t          nPos
+    virtual void        SetMenuLabel( size_t          nPos
                                     ,const wxString& rLabel
                                    );
-    virtual wxString    GetLabelTop(size_t nPos) const;
+    virtual wxString    GetMenuLabel(size_t nPos) const;
 
     //
     // Implementation from now on