fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index fbb4ab7b2ec59ec03972fd3a20ddfc716b7d655c..78f847c2238c09e16eecc59598b57ef9e948501c 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -1,22 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cursor.h
+// Purpose:     wxCursor base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_CURSOR_H_BASE_
 #define _WX_CURSOR_H_BASE_
 
-#if defined(__WXMSW__)
-#include "wx/msw/cursor.h"
+#include "wx/defs.h"
+
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/cursor.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/cursor.h"
+    #include "wx/motif/cursor.h"
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/cursor.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/cursor.h"
+    #include "wx/gtk1/cursor.h"
 #elif defined(__WXX11__)
-#include "wx/x11/cursor.h"
+    #include "wx/x11/cursor.h"
 #elif defined(__WXMGL__)
-#include "wx/mgl/cursor.h"
+    #include "wx/mgl/cursor.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/cursor.h"
+    #include "wx/mac/cursor.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)
-#include "wx/os2/cursor.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/cursor.h"
+    #include "wx/os2/cursor.h"
 #endif
 
 #include "wx/utils.h"