Include wx/cursor.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/cocoa/cursor.mm

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.mm
+// Name:        src/cocoa/cursor.mm
 // Purpose:     wxCursor class for wxCocoa
 // Author:      Ryan Norton
 // Modified by:
@@ -10,9 +10,11 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/cursor.h"
+
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
-    #include "wx/cursor.h"
 #endif //WX_PRECOMP
 
 #import <AppKit/NSCursor.h>
@@ -250,7 +252,6 @@ wxCursor::wxCursor()
 wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height),
     int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY), const char WXUNUSED(maskBits)[])
 {
-    
 }
 
 wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
@@ -450,9 +451,8 @@ void wxEndBusyCursor()
     }
 }
 
-// TRUE if we're between the above two calls
+// true if we're between the above two calls
 bool wxIsBusy()
 {
   return (wxBusyCursorCount > 0);
 }
-

src/common/gdicmn.cpp

@@ -32,10 +32,10 @@
     #include "wx/brush.h"
     #include "wx/palette.h"
     #include "wx/icon.h"
+    #include "wx/cursor.h"
 #endif
 
 #include "wx/bitmap.h"
-#include "wx/cursor.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/hashmap.h"

src/gtk/data.cpp

@@ -14,10 +14,9 @@
     #include "wx/object.h"
     #include "wx/window.h"
     #include "wx/dc.h"
+    #include "wx/cursor.h"
 #endif
 
-#include "wx/cursor.h"
-
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor g_globalCursor;

src/gtk/dialog.cpp

@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
+    #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
-#include "wx/cursor.h"
 #include "wx/evtloop.h"
 
 #include <gdk/gdk.h>

src/gtk/popupwin.cpp

@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
+    #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
-#include "wx/cursor.h"
-
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>

src/gtk1/data.cpp

@@ -14,10 +14,9 @@
     #include "wx/object.h"
     #include "wx/window.h"
     #include "wx/dc.h"
+    #include "wx/cursor.h"
 #endif
 
-#include "wx/cursor.h"
-
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor g_globalCursor;

src/gtk1/dialog.cpp

@@ -15,9 +15,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
+    #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
-#include "wx/cursor.h"
 #include "wx/evtloop.h"
 
 #include <gdk/gdk.h>

src/gtk1/popupwin.cpp

@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/frame.h"
+    #include "wx/cursor.h"
 #endif // WX_PRECOMP
 
-#include "wx/cursor.h"
-
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
@@ -221,7 +220,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     gtk_signal_connect (GTK_OBJECT(m_widget), "button_press_event",
         GTK_SIGNAL_FUNC(gtk_popup_button_press), (gpointer)this );
 
-    return TRUE;
+    return true;
 }
 
 void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )

src/mac/carbon/app.cpp

@@ -26,10 +26,10 @@
     #include "wx/brush.h"
     #include "wx/palette.h"
     #include "wx/icon.h"
+    #include "wx/cursor.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/cursor.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

src/mac/classic/app.cpp

@@ -30,10 +30,10 @@
     #include "wx/brush.h"
     #include "wx/palette.h"
     #include "wx/icon.h"
+    #include "wx/cursor.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/cursor.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"

src/mgl/data.cpp

@@ -14,7 +14,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/cursor.h"
+#ifndef WX_PRECOMP
+    #include "wx/cursor.h"
+#endif
 
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */

src/msw/cursor.cpp

@@ -24,12 +24,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/cursor.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
     #include "wx/icon.h"
-    #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
 #endif

src/os2/cursor.cpp

@@ -12,12 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/cursor.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/cursor.h"
     #include "wx/icon.h"
 #endif
 

src/palmos/cursor.cpp

@@ -24,12 +24,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/cursor.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
     #include "wx/icon.h"
-    #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
 #endif
@@ -110,7 +111,7 @@ wxCursor::~wxCursor()
 
 bool wxCursor::operator==(const wxCursor& cursor) const
 {
-    return FALSE;
+    return false;
 }
 
 wxGDIImageRefData *wxCursor::CreateData() const
@@ -130,5 +131,3 @@ const wxCursor *wxGetGlobalCursor()
 void wxSetCursor(const wxCursor& cursor)
 {
 }
-
-

src/x11/utils.cpp

@@ -29,11 +29,11 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/window.h" // for wxTopLevelWindows
+    #include "wx/cursor.h"
 #endif
 
 #include "wx/apptrait.h"
 #include "wx/msgdlg.h"
-#include "wx/cursor.h"
 
 #include <ctype.h>
 #include <stdarg.h>