check that the conversion to wxDateTime was really successful

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 8262a9f1808cda4ab989df664cc4c93a96b740d8..60f660ccc77f07c21d0dd65819dbe01ccfb9e360 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -75,8 +75,8 @@ public:
 
 #if wxUSE_ACCEL
     // called by wxMenuBar to build its accel table from the accels of all menus
 
 #if wxUSE_ACCEL
     // called by wxMenuBar to build its accel table from the accels of all menus

-    bool HasAccels() const { return !m_accels.IsEmpty(); }
-    size_t GetAccelCount() const { return m_accels.GetCount(); }
+    bool HasAccels() const { return !m_accels.empty(); }
+    size_t GetAccelCount() const { return m_accels.size(); }

     size_t CopyAccels(wxAcceleratorEntry *accels) const;
 
     // called by wxMenuItem when its accels changes
     size_t CopyAccels(wxAcceleratorEntry *accels) const;
 
     // called by wxMenuItem when its accels changes


@@ -84,6 +84,11 @@ public:
 
     // helper used by wxMenu itself (returns the index in m_accels)
     int FindAccel(int id) const;
 
     // helper used by wxMenu itself (returns the index in m_accels)
     int FindAccel(int id) const;

+
+    // used only by wxMDIParentFrame currently but could be useful elsewhere:
+    // returns a new accelerator table with accelerators for just this menu
+    // (shouldn't be called if we don't have any accelerators)
+    wxAcceleratorTable *CreateAccelTable() const;

 #endif // wxUSE_ACCEL
 
 protected:
 #endif // wxUSE_ACCEL
 
 protected:


@@ -183,9 +188,6 @@ public:
 #endif
 
 #if wxUSE_ACCEL
 #endif
 
 #if wxUSE_ACCEL

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

     // update the accel table (must be called after adding/deleting a menu)
     void RebuildAccelTable();
 #endif // wxUSE_ACCEL
     // update the accel table (must be called after adding/deleting a menu)
     void RebuildAccelTable();
 #endif // wxUSE_ACCEL


@@ -213,10 +215,6 @@ protected:
     // Return the MSW position for a wxMenu which is sometimes different from
     // the wxWidgets position.
     int MSWPositionForWxMenu(wxMenu *menu, int wxpos);
     // 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;
-#endif // wxUSE_ACCEL

 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
     wxToolBar*  m_toolBar;
 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
     wxToolBar*  m_toolBar;