Applied ref-couting patch.

[wxWidgets.git] / src / x11 / cursor.cpp

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 77ac73f1610416d7f3d4682efb2691dfa03486f2..49e9f1c1d7752481fea5595872728dd0759cb0f1 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -1,19 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.cpp
+// Name:        src/x11/cursor.cpp

 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/cursor.h"
 #include "wx/cursor.h"

-#include "wx/gdicmn.h"
-#include "wx/icon.h"
-#include "wx/app.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/icon.h"
+    #include "wx/gdicmn.h"
+#endif

 
 #include "wx/x11/private.h"
 
 
 #include "wx/x11/private.h"
 


@@ -30,7 +36,7 @@ class wxCursorRefData: public wxObjectRefData
 public:
 
     wxCursorRefData();
 public:
 
     wxCursorRefData();

-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();

 
     WXCursor     m_cursor;
     WXDisplay   *m_display;
 
     WXCursor     m_cursor;
     WXDisplay   *m_display;


@@ -65,14 +71,14 @@ wxCursor::wxCursor( int cursorId )
 
 #if wxUSE_NANOX
     // TODO Create some standard cursors from bitmaps.
 
 #if wxUSE_NANOX
     // TODO Create some standard cursors from bitmaps.

-    
-    
+
+

 #else
     // !wxUSE_NANOX
 #else
     // !wxUSE_NANOX

-    
+

     M_CURSORDATA->m_display = wxGlobalDisplay();
     wxASSERT_MSG( M_CURSORDATA->m_display, wxT("No display") );
     M_CURSORDATA->m_display = wxGlobalDisplay();
     wxASSERT_MSG( M_CURSORDATA->m_display, wxT("No display") );

-    
+

     int x_cur = XC_left_ptr;
     switch (cursorId)
     {
     int x_cur = XC_left_ptr;
     switch (cursorId)
     {