fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 7d388880bb87b229ca85029470e5a775a1d2b02b..367802df0231f01fe0d8db8f0d03ddfe3c719f94 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -12,6 +12,8 @@
 #ifndef   _OWNERDRW_H
 #define   _OWNERDRW_H
 
 #ifndef   _OWNERDRW_H
 #define   _OWNERDRW_H
 

+#include "wx/defs.h"
+

 #if wxUSE_OWNER_DRAWN
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #if wxUSE_OWNER_DRAWN
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -38,7 +40,7 @@ public:
   wxOwnerDrawn(const wxString& str = wxEmptyString,
                bool bCheckable = false,
                bool bMenuItem = false); // FIXME kludge for colors
   wxOwnerDrawn(const wxString& str = wxEmptyString,
                bool bCheckable = false,
                bool bMenuItem = false); // FIXME kludge for colors

-  virtual ~wxOwnerDrawn() { }
+  virtual ~wxOwnerDrawn();

 
   // fix appearance
   void SetFont(const wxFont& font)
 
   // fix appearance
   void SetFont(const wxFont& font)


@@ -140,6 +142,13 @@ 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:

+  // return true if this is a menu item
+  bool IsMenuItem() const;
+
+  // get the font to use, whether m_font is set or not
+  wxFont GetFontToUse() const;
+
+

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