Finally really correct background erasing for wxMSW wxToolBar.

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

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 0635c03de7c9949c75b6abb4b05aacbc8d7fdaf0..6688cfafeec12860d9f6ca1b32db97d29ae9f786 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -1,19 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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"
+    #include "wx/image.h"
+#endif

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


@@ -25,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;


@@ -59,20 +66,20 @@ wxCursor::wxCursor()
 
 }
 
 
 }
 

-wxCursor::wxCursor( int cursorId )
+void wxCursor::InitFromStock( wxStockCursor cursorId )

 {
     m_refData = new wxCursorRefData();
 
 #if wxUSE_NANOX
     // TODO Create some standard cursors from bitmaps.
 {
     m_refData = new wxCursorRefData();
 
 #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)
     {


@@ -117,15 +124,15 @@ 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 wxString& WXUNUSED(name),
+                    wxBitmapType WXUNUSED(type),
+                    int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))

 {
 {

-   wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") );
+   wxFAIL_MSG( wxT("wxCursor creation from file not yet implemented") );

 }
 
 #if wxUSE_IMAGE
 }
 
 #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") );
 }


@@ -135,19 +142,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(*static_cast<const wxCursorRefData *>(data));

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


@@ -186,7 +188,7 @@ void wxEndBusyCursor()
         wxTheApp->ProcessIdle();
 }
 
         wxTheApp->ProcessIdle();
 }
 

-void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
+void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )

 {
     if (gs_busyCount++ > 0)
         return;
 {
     if (gs_busyCount++ > 0)
         return;