use wxConvLocal for wxFONTENCODING_SYSTEM/DEFAULT in wxConvertToGTK()

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

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 55847bb23e3feba14d77a604c1a398216581a579..0635c03de7c9949c75b6abb4b05aacbc8d7fdaf0 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -9,10 +9,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "cursor.h"
-#endif
-
 #include "wx/cursor.h"
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
@@ -20,7 +16,10 @@
 #include "wx/utils.h"
 
 #include "wx/x11/private.h"
+
+#if !wxUSE_NANOX
 #include <X11/cursorfont.h>
+#endif
 
 //-----------------------------------------------------------------------------
 // wxCursor
@@ -64,6 +63,13 @@ wxCursor::wxCursor( int cursorId )
 {
     m_refData = new wxCursorRefData();
 
+#if wxUSE_NANOX
+    // TODO Create some standard cursors from bitmaps.
+    
+    
+#else
+    // !wxUSE_NANOX
+    
     M_CURSORDATA->m_display = wxGlobalDisplay();
     wxASSERT_MSG( M_CURSORDATA->m_display, wxT("No display") );
     
@@ -108,25 +114,20 @@ wxCursor::wxCursor( int cursorId )
     }
 
     M_CURSORDATA->m_cursor = (WXCursor) XCreateFontCursor( (Display*) M_CURSORDATA->m_display, x_cur );
+#endif
 }
 
 wxCursor::wxCursor(const char bits[], int width, int  height,
                    int hotSpotX, int hotSpotY,
                    const char maskBits[], wxColour *fg, wxColour *bg)
 {
-   wxFAIL_MSG( "wxCursor creation from bits not yet implemented" );
-}
-
-
-wxCursor::wxCursor( const wxCursor &cursor )
-{
-    Ref( cursor );
+   wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") );
 }
 
 #if wxUSE_IMAGE
 wxCursor::wxCursor( const wxImage & image )
 {
-   wxFAIL_MSG( "wxCursor creation from wxImage not yet implemented" );
+   wxFAIL_MSG( wxT("wxCursor creation from wxImage not yet implemented") );
 }
 #endif
 
@@ -134,16 +135,6 @@ wxCursor::~wxCursor()
 {
 }
 
-wxCursor& wxCursor::operator = ( const wxCursor& cursor )
-{
-    if (*this == cursor)
-        return (*this);
-
-    Ref( cursor );
-
-    return *this;
-}
-
 bool wxCursor::operator == ( const wxCursor& cursor ) const
 {
     return m_refData == cursor.m_refData;
@@ -192,7 +183,7 @@ void wxEndBusyCursor()
     gs_savedCursor = wxNullCursor;
 
     if (wxTheApp)
-        wxTheApp->SendIdleEvents();
+        wxTheApp->ProcessIdle();
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
@@ -208,7 +199,7 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 
     if (wxTheApp)
-        wxTheApp->SendIdleEvents();
+        wxTheApp->ProcessIdle();
 }
 
 bool wxIsBusy()