added wxRectFromRECT()

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 071ea344633f5629d5df38b35f21b00ce3e7686d..21853e472875667588cbc63d2f203603635858c0 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -20,7 +20,7 @@
     #include "wx/accel.h"
     #include "wx/dynarray.h"
 
-    WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
+    WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
 #endif // wxUSE_ACCEL
 
 class WXDLLEXPORT wxFrame;
@@ -29,6 +29,20 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 #endif
 
+
+// Not using a combined wxToolBar/wxMenuBar? then use
+// a commandbar in WinCE .NET to implement the
+// menubar, since there is no ::SetMenu function.
+#if defined(__WXWINCE__)
+#   if ((_WIN32_WCE >= 400) && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)) || \
+        defined(__HANDHELDPC__)
+#       define WINCE_WITH_COMMANDBAR
+#   else
+#       define WINCE_WITHOUT_COMMANDBAR
+#   endif
+#endif
+
+
 #include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------
@@ -47,9 +61,9 @@ public:
     virtual ~wxMenu();
 
     // implement base class virtuals
-    virtual bool DoAppend(wxMenuItem *item);
-    virtual bool DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem *DoRemove(wxMenuItem *item);
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
 
     virtual void Break();
 
@@ -102,7 +116,7 @@ private:
     // terminate the current radio group, if any
     void EndRadioGroup();
 
-    // if TRUE, insert a breal before appending the next item
+    // if true, insert a breal before appending the next item
     bool m_doBreak;
 
     // the position of the first item in the current radio group or -1
@@ -129,7 +143,7 @@ public :
     wxMenuInfo() { m_menu = NULL ; }
     virtual ~wxMenuInfo() { }
 
-    void Create( wxMenu *menu , const wxString &title ) 
+    void Create( wxMenu *menu , const wxString &title )
     { m_menu = menu ; m_title = title ; }
     wxMenu* GetMenu() const { return m_menu ; }
     wxString GetTitle() const { return m_title ; }
@@ -145,7 +159,7 @@ WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
 class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
 {
 public:
-    // ctors & dtor 
+    // ctors & dtor
         // default constructor
     wxMenuBar();
         // unused under MSW
@@ -178,6 +192,11 @@ public:
     wxToolBar* GetToolBar() const { return m_toolBar; }
 #endif
 
+#ifdef WINCE_WITH_COMMANDBAR
+    WXHWND GetCommandBar() const { return m_commandBar; }
+    bool AddAdornments(long style);
+#endif
+
 #if wxUSE_ACCEL
     // get the accel table for all the menus
     const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
@@ -206,6 +225,9 @@ protected:
 
     WXHMENU       m_hMenu;
 
+    // Return the MSW position for a wxMenu which is sometimes different from
+    // the wxWidgets position.
+    int MSWPositionForWxMenu(wxMenu *menu, int wxpos);
 #if wxUSE_ACCEL
     // the accelerator table for all accelerators in all our menus
     wxAcceleratorTable m_accelTable;
@@ -215,6 +237,11 @@ protected:
     wxToolBar*  m_toolBar;
 #endif
 
+#ifdef WINCE_WITH_COMMANDBAR
+    WXHWND      m_commandBar;
+    bool        m_adornmentsAdded;
+#endif
+
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)
 };