Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow...

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

diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index 9cbc07a306bbbacd8ab40927f8fb8f61f9bc8c52..bba7e590f28bb6b7186f22c046eff8fabc057bc1 100644 (file)
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.h
+// Name:        wx/mgl/cursor.h

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -10,8 +10,7 @@
 #ifndef __WX_CURSOR_H__
 #define __WX_CURSOR_H__
 
 #ifndef __WX_CURSOR_H__
 #define __WX_CURSOR_H__
 

-#include "wx/defs.h"
-#include "wx/object.h"
+#include "wx/gdiobj.h"

 #include "wx/gdicmn.h"
 
 class MGLCursor;
 #include "wx/gdicmn.h"
 
 class MGLCursor;


@@ -20,28 +19,26 @@ class MGLCursor;
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCursor: public wxObject
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject

 {
 public:
 
     wxCursor();
 {
 public:
 
     wxCursor();

-    wxCursor(int cursorId);
-    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(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif

     wxCursor(const wxString& name,
     wxCursor(const wxString& name,

-             long flags = wxBITMAP_TYPE_CUR_RESOURCE,
+             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,

              int hotSpotX = 0, int hotSpotY = 0);
     virtual ~wxCursor();
              int hotSpotX = 0, int hotSpotY = 0);
     virtual ~wxCursor();

-    bool operator == (const wxCursor& cursor) const;
-    bool operator != (const wxCursor& cursor) const;
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;

 
     // implementation
     MGLCursor *GetMGLCursor() const;
 
 private:
 
     // implementation
     MGLCursor *GetMGLCursor() const;
 
 private:

+    void InitFromStock(wxStockCursor);
+

     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };