Fixed filename in wxOSX-Cocoa's file dialog using extension of wrong file type.

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

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index 5fdf62fae95b9df6fd83e29bf25c9ac7acabe75d..7f99c1e9876f82499293053bb8af20b26a22a321 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -15,11 +15,14 @@
 #endif
 
 #include "wx/cursor.h"
 #endif
 
 #include "wx/cursor.h"

-#include "wx/module.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/hashmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/hashmap.h"
+    #include "wx/module.h"
+#endif

 
 #include "wx/mgl/private.h"
 
 
 #include "wx/mgl/private.h"
 


@@ -33,14 +36,14 @@ class wxCursorRefData: public wxObjectRefData
   public:
 
     wxCursorRefData();
   public:
 
     wxCursorRefData();

-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();

 
     MGLCursor *m_cursor;
 };
 
 wxCursorRefData::wxCursorRefData()
 {
 
     MGLCursor *m_cursor;
 };
 
 wxCursorRefData::wxCursorRefData()
 {

-    m_cursor = (MGLCursor*) NULL;
+    m_cursor = NULL;

 }
 
 wxCursorRefData::~wxCursorRefData()
 }
 
 wxCursorRefData::~wxCursorRefData()


@@ -62,14 +65,14 @@ wxCursor::wxCursor()
 {
 }
 
 {
 }
 

-wxCursor::wxCursor(int cursorId)
+void wxCursor::InitFromStock(wxStockCursor cursorId)

 {
     if ( !gs_cursorsHash )
         gs_cursorsHash = new wxCursorsHash;
 
     if ( gs_cursorsHash->find(cursorId) != gs_cursorsHash->end() )
     {
 {
     if ( !gs_cursorsHash )
         gs_cursorsHash = new wxCursorsHash;
 
     if ( gs_cursorsHash->find(cursorId) != gs_cursorsHash->end() )
     {

-        wxLogTrace(_T("mglcursor"), _T("cursor id %i fetched from cache"), cursorId);
+        wxLogTrace(wxT("mglcursor"), wxT("cursor id %i fetched from cache"), cursorId);

         *this = (*gs_cursorsHash)[cursorId];
         return;
     }
         *this = (*gs_cursorsHash)[cursorId];
         return;
     }


@@ -132,26 +135,16 @@ wxCursor::wxCursor(int cursorId)
     else
     {
         (*gs_cursorsHash)[cursorId] = *this;
     else
     {
         (*gs_cursorsHash)[cursorId] = *this;

-        wxLogTrace(_T("mglcursor"), _T("cursor id %i added to cache (%s)"),
+        wxLogTrace(wxT("mglcursor"), wxT("cursor id %i added to cache (%s)"),

                    cursorId, cursorname);
     }
 }
 
                    cursorId, cursorname);
     }
 }
 

-wxCursor::wxCursor(const char WXUNUSED(bits)[],
-                   int WXUNUSED(width),
-                   int WXUNUSED(height),
-                   int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY),
-                   const char WXUNUSED(maskBits)[],
-                   wxColour * WXUNUSED(fg), wxColour * WXUNUSED(bg) )
-{
-    //FIXME_MGL
-}
-

 wxCursor::wxCursor(const wxString& cursor_file,
 wxCursor::wxCursor(const wxString& cursor_file,

-                   long flags,
+                   wxBitmapType type,

                    int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))
 {
                    int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))
 {

-    if ( flags == wxBITMAP_TYPE_CUR || flags == wxBITMAP_TYPE_CUR_RESOURCE )
+    if ( type == wxBITMAP_TYPE_CUR || type == wxBITMAP_TYPE_CUR_RESOURCE )

     {
         m_refData = new wxCursorRefData();
         M_CURSORDATA->m_cursor = new MGLCursor(cursor_file.mb_str());
     {
         m_refData = new wxCursorRefData();
         M_CURSORDATA->m_cursor = new MGLCursor(cursor_file.mb_str());


@@ -172,21 +165,6 @@ wxCursor::~wxCursor()
     // wxObject unrefs data
 }
 
     // wxObject unrefs data
 }
 

-bool wxCursor::operator == (const wxCursor& cursor) const
-{
-    return (m_refData == cursor.m_refData);
-}
-
-bool wxCursor::operator != (const wxCursor& cursor) const
-{
-    return (m_refData != cursor.m_refData);
-}
-
-bool wxCursor::Ok() const
-{
-    return (m_refData != NULL);
-}
-

 MGLCursor *wxCursor::GetMGLCursor() const
 {
     return M_CURSORDATA->m_cursor;
 MGLCursor *wxCursor::GetMGLCursor() const
 {
     return M_CURSORDATA->m_cursor;