wxMotif compiles and links now.

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index f01dafd08061662b8a5615cfa55de960005db2eb..c36a5fced286f1f9aa958acc7261b1740f14fe4e 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -18,6 +18,7 @@
 
 #include "wx/defs.h"
 #include "wx/event.h"
 
 #include "wx/defs.h"
 #include "wx/event.h"

+#include "wx/dynarray.h"

 
 class WXDLLEXPORT wxMenuItem;
 class WXDLLEXPORT wxMenuBar;
 
 class WXDLLEXPORT wxMenuItem;
 class WXDLLEXPORT wxMenuBar;


@@ -125,8 +126,10 @@ public:
     void Attach(wxMenuBar *menubar);
     void Detach();
 
     void Attach(wxMenuBar *menubar);
     void Detach();
 

+#if wxUSE_ACCEL

     size_t GetAccelCount() const { return m_accelKeyCodes.GetCount(); }
     size_t CopyAccels(wxAcceleratorEntry *accels) const;
     size_t GetAccelCount() const { return m_accelKeyCodes.GetCount(); }
     size_t CopyAccels(wxAcceleratorEntry *accels) const;

+#endif // wxUSE_ACCEL

 
 #ifdef WXWIN_COMPATIBILITY
     void Callback(const wxFunction func) { m_callback = func; }
 
 #ifdef WXWIN_COMPATIBILITY
     void Callback(const wxFunction func) { m_callback = func; }


@@ -159,8 +162,10 @@ private:
     wxWindow         *m_pInvokingWindow;
     void*             m_clientData;
 
     wxWindow         *m_pInvokingWindow;
     void*             m_clientData;
 

+#if wxUSE_ACCEL

     // the accelerators data
     wxArrayInt        m_accelKeyCodes, m_accelFlags, m_accelIds;
     // the accelerators data
     wxArrayInt        m_accelKeyCodes, m_accelFlags, m_accelIds;

+#endif // wxUSE_ACCEL

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -212,7 +217,7 @@ public:
 
     // notifications: return FALSE to prevent the menu from being
     // appended/deleted
 
     // notifications: return FALSE to prevent the menu from being
     // appended/deleted

-    virtual bool OnAppend(wxMenu *menu, const char *title);
+    virtual bool OnAppend(wxMenu *menu, const wxChar *title);

     virtual bool OnDelete(wxMenu *menu, int index);
 
     // item search
     virtual bool OnDelete(wxMenu *menu, int index);
 
     // item search


@@ -245,8 +250,11 @@ public:
         // attach to a frame
     void Attach(wxFrame *frame);
 
         // attach to a frame
     void Attach(wxFrame *frame);
 

+#if wxUSE_ACCEL

         // get the accel table for the menus
     const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
         // get the accel table for the menus
     const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }

+#endif // wxUSE_ACCEL
+

         // get the menu handle
     WXHMENU GetHMenu() const { return m_hMenu; }
 
         // get the menu handle
     WXHMENU GetHMenu() const { return m_hMenu; }
 


@@ -265,8 +273,10 @@ protected:
     wxFrame      *m_menuBarFrame;
     WXHMENU       m_hMenu;
 
     wxFrame      *m_menuBarFrame;
     WXHMENU       m_hMenu;
 

+#if wxUSE_ACCEL

     // the accelerator table for all accelerators in all our menus
     wxAcceleratorTable m_accelTable;
     // the accelerator table for all accelerators in all our menus
     wxAcceleratorTable m_accelTable;

+#endif // wxUSE_ACCEL

 };
 
 #endif // _WX_MENU_H_
 };
 
 #endif // _WX_MENU_H_