Adapted printing samples makefiles.

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

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 55847bb23e3feba14d77a604c1a398216581a579..fe53a0a5e91d396705bb80cfa007178703a8192a 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "cursor.h"
 #endif
 
 #pragma implementation "cursor.h"
 #endif
 


@@ -20,7 +20,10 @@
 #include "wx/utils.h"
 
 #include "wx/x11/private.h"
 #include "wx/utils.h"
 
 #include "wx/x11/private.h"

+
+#if !wxUSE_NANOX

 #include <X11/cursorfont.h>
 #include <X11/cursorfont.h>

+#endif

 
 //-----------------------------------------------------------------------------
 // wxCursor
 
 //-----------------------------------------------------------------------------
 // wxCursor


@@ -64,6 +67,13 @@ wxCursor::wxCursor( int cursorId )
 {
     m_refData = new wxCursorRefData();
 
 {
     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") );
     
     M_CURSORDATA->m_display = wxGlobalDisplay();
     wxASSERT_MSG( M_CURSORDATA->m_display, wxT("No display") );
     


@@ -108,13 +118,14 @@ wxCursor::wxCursor( int cursorId )
     }
 
     M_CURSORDATA->m_cursor = (WXCursor) XCreateFontCursor( (Display*) M_CURSORDATA->m_display, x_cur );
     }
 
     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)
 {
 }
 
 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" );
+   wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") );

 }
 
 
 }
 
 


@@ -126,7 +137,7 @@ wxCursor::wxCursor( const wxCursor &cursor )
 #if wxUSE_IMAGE
 wxCursor::wxCursor( const wxImage & image )
 {
 #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
 
 }
 #endif
 


@@ -192,7 +203,7 @@ void wxEndBusyCursor()
     gs_savedCursor = wxNullCursor;
 
     if (wxTheApp)
     gs_savedCursor = wxNullCursor;
 
     if (wxTheApp)

-        wxTheApp->SendIdleEvents();
+        wxTheApp->ProcessIdle();

 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )


@@ -208,7 +219,7 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 
     if (wxTheApp)
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 
     if (wxTheApp)

-        wxTheApp->SendIdleEvents();
+        wxTheApp->ProcessIdle();

 }
 
 bool wxIsBusy()
 }
 
 bool wxIsBusy()