Rebake from clean wx tree.

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

diff --git a/include/wx/os2/menu.h b/include/wx/os2/menu.h
index b088026c217d61bd3bcfbb1e0e3250747bd3ef12..95ad8e33c9793133718c096d6d69648a7d8b8a5c 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);
 


@@ -28,7 +28,7 @@ void wxSetShortCutKey(wxChar* zText);
 // Menu
 // ----------------------------------------------------------------------------
 
 // Menu
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMenu : public wxMenuBase
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase

 {
 public:
     //
 {
 public:
     //


@@ -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


@@ -172,7 +172,7 @@ private:
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
 
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase

 {
 public:
     //
 {
 public:
     //


@@ -194,6 +194,7 @@ public:
     wxMenuBar( int            n
               ,wxMenu*        vMenus[]
               ,const wxString sTitles[]
     wxMenuBar( int            n
               ,wxMenu*        vMenus[]
               ,const wxString sTitles[]

+              ,long           lStyle = 0

              );
     virtual ~wxMenuBar();
 
              );
     virtual ~wxMenuBar();
 


@@ -225,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


@@ -244,7 +245,7 @@ public:
     const wxAcceleratorTable& GetAccelTable(void) const { return m_vAccelTable; }
 
     //
     const wxAcceleratorTable& GetAccelTable(void) const { return m_vAccelTable; }
 
     //

-    // Update the accel table (must be called after adding/deletign a menu)
+    // Update the accel table (must be called after adding/deleting a menu)

     //
     void                      RebuildAccelTable(void);
 #endif // wxUSE_ACCEL
     //
     void                      RebuildAccelTable(void);
 #endif // wxUSE_ACCEL