warnings (and some errors) fixes for wxUniv DLL build

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

diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index d7399039a0f380635679be4259b384463b90d8ae..04f6efd9719936fe919e621396b45c8acfd0e1fb 100644 (file)
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -18,6 +18,8 @@
 
 #if wxUSE_LISTCTRL
 
+#include "wx/font.h"
+
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
@@ -81,6 +83,11 @@ typedef int (wxCALLBACK *wxListCtrlCompare)(long item1, long item2, long sortDat
 #define wxLIST_STATE_FOCUSED        0x0002
 #define wxLIST_STATE_SELECTED       0x0004
 #define wxLIST_STATE_CUT            0x0008      // MSW only
+#define wxLIST_STATE_DISABLED       0x0010      // OS2 only
+#define wxLIST_STATE_FILTERED       0x0020      // OS2 only
+#define wxLIST_STATE_INUSE          0x0040      // OS2 only
+#define wxLIST_STATE_PICKED         0x0080      // OS2 only
+#define wxLIST_STATE_SOURCE         0x0100      // OS2 only
 
 // Hit test flags, used in HitTest
 #define wxLIST_HITTEST_ABOVE            0x0001  // Above the client area.
@@ -287,6 +294,10 @@ public:
     int             m_format;   // left, right, centre
     int             m_width;    // width of column
 
+#ifdef __WXPM__
+    int             m_miniImage; // handle to the mini image for OS/2
+#endif
+
 protected:
     // creates m_attr if we don't have it yet
     wxListItemAttr& Attributes()
@@ -383,7 +394,7 @@ public:
     wxListItem    m_item;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxListEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListEvent)
 };
 
 // ----------------------------------------------------------------------------