(blind) fixes for Motif compilation

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

diff --git a/include/wx/ownerdrw.h b/include/wx/ownerdrw.h
index 3008d453a8c90b656715aa6df2101ff0a655fab0..a9a54e7997ce0b991286621bd645120c058703e7 100644 (file)
--- a/include/wx/ownerdrw.h
+++ b/include/wx/ownerdrw.h
@@ -12,14 +12,16 @@
 #ifndef   _OWNERDRW_H
 #define   _OWNERDRW_H
 
 #ifndef   _OWNERDRW_H
 #define   _OWNERDRW_H
 

-#include "wx/setup.h"
-

 #if wxUSE_OWNER_DRAWN
 
 #ifdef    __GNUG__
     #pragma interface "ownerdrw.h"
 #endif
 
 #if wxUSE_OWNER_DRAWN
 
 #ifdef    __GNUG__
     #pragma interface "ownerdrw.h"
 #endif
 

+#include "wx/bitmap.h"
+#include "wx/colour.h"
+#include "wx/font.h"
+

 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn
 //                behaviour
 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn
 //                behaviour


@@ -61,6 +63,10 @@ public:
         m_bmpUnchecked = bmpUnchecked;
         m_bOwnerDrawn = TRUE; }
 
         m_bmpUnchecked = bmpUnchecked;
         m_bOwnerDrawn = TRUE; }
 

+  void SetBitmap(const wxBitmap& bmpChecked)
+      { m_bmpChecked = bmpChecked;
+        m_bOwnerDrawn = TRUE; }
+

   const wxBitmap& GetBitmap(bool bChecked = TRUE) const
       { return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
 
   const wxBitmap& GetBitmap(bool bChecked = TRUE) const
       { return (bChecked ? m_bmpChecked : m_bmpUnchecked); }