Works a little better when you remember to say "virtual"

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

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index f946e960ae0d6c6212f83c111e79d1bd28e2dc1f..b2b144c9bd71546a85a65c354c3e99b096709035 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _OWNERDRW_H
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _OWNERDRW_H


@@ -14,7 +14,7 @@
 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 

-#ifdef    __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "ownerdrw.h"
 #endif
 
     #pragma interface "ownerdrw.h"
 #endif
 


@@ -146,6 +146,7 @@ private:
             m_bmpUnchecked; // (checked is used also for 'uncheckable' items)
 
   size_t    m_nHeight,      // font height
             m_bmpUnchecked; // (checked is used also for 'uncheckable' items)
 
   size_t    m_nHeight,      // font height

+            m_nMinHeight,   // minimum height, as determined by user's system settings

             m_nMarginWidth; // space occupied by bitmap to the left of the item
 };
 
             m_nMarginWidth; // space occupied by bitmap to the left of the item
 };