translate "Copy URL" string in the popup menu (feature request 1803958) (should have...

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

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index 35c3b9016c97a538d11739f4aef4fd192c337d6a..a4c380faa89fba6574c9601d786f1b4765c65972 100644 (file)
--- a/include/wx/os2/menu.h
+++ b/include/wx/os2/menu.h
@@ -17,10 +17,10 @@
     #include "wx/list.h"        // for "template" list classes
     #include "wx/dynarray.h"
 
     #include "wx/list.h"        // for "template" list classes
     #include "wx/dynarray.h"
 

-    WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);
+    WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);

 #endif // wxUSE_ACCEL
 
 #endif // wxUSE_ACCEL
 

-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;

 
 void wxSetShortCutKey(wxChar* zText);
 
 
 void wxSetShortCutKey(wxChar* zText);
 


@@ -139,9 +139,9 @@ private:
     void EndRadioGroup(void);
 
     //
     void EndRadioGroup(void);
 
     //

-    // If TRUE, insert a breal before appending the next item
+    // If true, insert a breal before appending the next item

     //
     //

-    bool                            m_bDoBreak;
+    bool m_bDoBreak;

 
     //
     // The menu handle of this menu
 
     //
     // The menu handle of this menu


@@ -226,10 +226,10 @@ public:
     virtual void        EnableTop( size_t nPos
                                   ,bool   bFlag
                                  );
     virtual void        EnableTop( size_t nPos
                                   ,bool   bFlag
                                  );

-    virtual void        SetLabelTop( size_t          nPos
+    virtual void        SetMenuLabel( size_t          nPos

                                     ,const wxString& rLabel
                                    );
                                     ,const wxString& rLabel
                                    );

-    virtual wxString    GetLabelTop(size_t nPos) const;
+    virtual wxString    GetMenuLabel(size_t nPos) const;

 
     //
     // Implementation from now on
 
     //
     // Implementation from now on