Changes corresponding to patch #841324 from Ian Brown:

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

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 7722a56fb9bac2a34cf7eb45f8545c200fee48b3..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
 


@@ -125,7 +125,7 @@ wxCursor::wxCursor(const char bits[], int width, int  height,
                    int hotSpotX, int hotSpotY,
                    const char maskBits[], wxColour *fg, wxColour *bg)
 {
                    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") );

 }
 
 
 }
 
 


@@ -137,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