Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / include / wx / ownerdrw.h

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 0ad31e7fec1446b0aeecb1a50a40631f282ab3eb..f946e960ae0d6c6212f83c111e79d1bd28e2dc1f 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -63,7 +63,7 @@ public:
         m_bmpUnchecked = bmpUnchecked;
         m_bOwnerDrawn = TRUE; }
 
         m_bmpUnchecked = bmpUnchecked;
         m_bOwnerDrawn = TRUE; }
 

-  void SetBitmap(const wxBitmap& bmpChecked);
+  void SetBitmap(const wxBitmap& bmpChecked)

       { m_bmpChecked = bmpChecked;
         m_bOwnerDrawn = TRUE; }
 
       { m_bmpChecked = bmpChecked;
         m_bOwnerDrawn = TRUE; }
 


@@ -92,6 +92,10 @@ public:
   void SetCheckable(bool checkable) { m_bCheckable = checkable; }
   bool IsCheckable() const { return m_bCheckable; }
 
   void SetCheckable(bool checkable) { m_bCheckable = checkable; }
   bool IsCheckable() const { return m_bCheckable; }
 

+  // this is for menu items only: accel string is drawn right aligned after the
+  // menu item if not empty
+  void SetAccelString(const wxString& strAccel) { m_strAccel = strAccel; }
+

   // this function might seem strange, but if it returns FALSE it means that
   // no non-standard attribute are set, so there is no need for this control
   // to be owner-drawn. Moreover, you can force owner-drawn to FALSE if you
   // this function might seem strange, but if it returns FALSE it means that
   // no non-standard attribute are set, so there is no need for this control
   // to be owner-drawn. Moreover, you can force owner-drawn to FALSE if you


@@ -125,7 +129,8 @@ public:
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
 protected:
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
 protected:

-  wxString  m_strName;      // label for a manu item
+  wxString  m_strName,      // label for a manu item
+            m_strAccel;     // the accel string ("Ctrl-F17") if any

 
 private:
   static size_t ms_nDefaultMarginWidth; // menu check mark width
 
 private:
   static size_t ms_nDefaultMarginWidth; // menu check mark width