fix the menu item bitmaps for wxMSW;

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

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index bd1e6ca2bd6535d3f8820d88c665900fc46870e7..942cf56c0e22d269e4a22fc3ca46dd90de85bd7a 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -31,10 +31,9 @@ extern bool g_isIdle;
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

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

 {
 {

-  public:
-
+public:

     wxCursorRefData();
     virtual ~wxCursorRefData();
 
     wxCursorRefData();
     virtual ~wxCursorRefData();
 


@@ -62,7 +61,7 @@ wxCursor::wxCursor()
 
 }
 
 
 }
 

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

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


@@ -316,14 +315,19 @@ wxCursor::~wxCursor()
 {
 }
 
 {
 }
 

-bool wxCursor::IsOk() const
+GdkCursor *wxCursor::GetCursor() const

 {
 {

-    return (m_refData != NULL);
+    return M_CURSORDATA->m_cursor;

 }
 
 }
 

-GdkCursor *wxCursor::GetCursor() const
+wxGDIRefData *wxCursor::CreateGDIRefData() const

 {
 {

-    return M_CURSORDATA->m_cursor;
+    return new wxCursorRefData;
+}
+
+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data));

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------