Move wxControl::GetCompositeControlsDefaultAttributes() from MSW to common.

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

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 1e1efbc681cedd316abbd4eafe6ca35e21c7cd61..6688cfafeec12860d9f6ca1b32db97d29ae9f786 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -19,6 +19,7 @@
     #include "wx/utils.h"
     #include "wx/icon.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"
     #include "wx/icon.h"
     #include "wx/gdicmn.h"

+    #include "wx/image.h"

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


@@ -31,7 +32,7 @@
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 
 {
 public:
 


@@ -65,7 +66,7 @@ wxCursor::wxCursor()
 
 }
 
 
 }
 

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

 {
     m_refData = new wxCursorRefData();
 
 {
     m_refData = new wxCursorRefData();
 


@@ -123,13 +124,11 @@ wxCursor::wxCursor( int cursorId )
 #endif
 }
 
 #endif
 }
 

-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))
+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


@@ -143,9 +142,14 @@ wxCursor::~wxCursor()
 {
 }
 
 {
 }
 

-bool wxCursor::IsOk() const
+wxGDIRefData *wxCursor::CreateGDIRefData() const

 {
 {

-    return (m_refData != NULL);
+    return new wxCursorRefData;
+}
+
+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));

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