use IMPLEMENT_APP_CONSOLE and not IMPLEMENT_APP for console apps

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

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 7fbd54c0280129a461fb6e05b5652d0023e22dd4..f1b2a9dc894fa3bbc79dbce76007d6443b384924 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -17,11 +17,11 @@
 #ifndef WX_PRECOMP
     #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"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
-#include "wx/icon.h"
-

 #include "wx/x11/private.h"
 
 #if !wxUSE_NANOX
 #include "wx/x11/private.h"
 
 #if !wxUSE_NANOX


@@ -32,12 +32,12 @@
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

-class wxCursorRefData: public wxObjectRefData
+class wxCursorRefData: public wxGDIRefData

 {
 public:
 
     wxCursorRefData();
 {
 public:
 
     wxCursorRefData();

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

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


@@ -124,15 +124,17 @@ wxCursor::wxCursor( int cursorId )
 #endif
 }
 
 #endif
 }
 

-wxCursor::wxCursor(const char bits[], int width, int  height,
-                   int hotSpotX, int hotSpotY,
-                   const char maskBits[], wxColour *fg, wxColour *bg)
+wxCursor::wxCursor(const char WXUNUSED(bits)[],
+                   int WXUNUSED(width), int WXUNUSED(height),
+                   int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY),
+                   const char WXUNUSED(maskBits)[],
+                   wxColour *WXUNUSED(fg), wxColour *WXUNUSED(bg))

 {
    wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") );
 }
 
 #if wxUSE_IMAGE
 {
    wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") );
 }
 
 #if wxUSE_IMAGE

-wxCursor::wxCursor( const wxImage & image )
+wxCursor::wxCursor( const wxImage & WXUNUSED(image) )

 {
    wxFAIL_MSG( wxT("wxCursor creation from wxImage not yet implemented") );
 }
 {
    wxFAIL_MSG( wxT("wxCursor creation from wxImage not yet implemented") );
 }


@@ -142,19 +144,14 @@ wxCursor::~wxCursor()
 {
 }
 
 {
 }
 

-bool wxCursor::operator == ( const wxCursor& cursor ) const
-{
-    return m_refData == cursor.m_refData;
-}
-
-bool wxCursor::operator != ( const wxCursor& cursor ) const
+wxGDIRefData *wxCursor::CreateGDIRefData() const

 {
 {

-    return m_refData != cursor.m_refData;
+    return new wxCursorRefData;

 }
 
 }
 

-bool wxCursor::Ok() const
+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const

 {
 {

-    return (m_refData != NULL);
+    return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data));

 }
 
 WXCursor wxCursor::GetCursor() const
 }
 
 WXCursor wxCursor::GetCursor() const