define __WXFUNCTION__ instead of redefining the (semi-)standard __FUNCTION__ which...

[wxWidgets.git] / include / wx / mgl / cursor.h

diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index d7ec246c7526f73b7e5baad964af748c44f63c90..c3146e569d878dcfa96e80ad9855b346cb731665 100644 (file)
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_CURSOR_H__
 #define __WX_CURSOR_H__
 
 #ifndef __WX_CURSOR_H__
 #define __WX_CURSOR_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "cursor.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdicmn.h"


@@ -31,7 +26,6 @@ public:
 
     wxCursor();
     wxCursor(int cursorId);
 
     wxCursor();
     wxCursor(int cursorId);

-    wxCursor(const wxCursor &cursor);

     wxCursor(const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0);
     wxCursor(const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0);


@@ -39,7 +33,6 @@ public:
              long flags = wxBITMAP_TYPE_CUR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
     ~wxCursor();
              long flags = wxBITMAP_TYPE_CUR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
     ~wxCursor();

-    wxCursor& operator = ( const wxCursor& cursor );

     bool operator == (const wxCursor& cursor) const;
     bool operator != (const wxCursor& cursor) const;
     bool Ok() const;
     bool operator == (const wxCursor& cursor) const;
     bool operator != (const wxCursor& cursor) const;
     bool Ok() const;