xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index b1058c29a67e2f46827fa0890cce91881b407036..3ea5cb74975026f37c3742b4806406eaccbe18f0 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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


@@ -35,6 +35,7 @@
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/settings.h"

+    #include "wx/intl.h"

 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"


@@ -154,8 +155,10 @@ void wxCursorRefData::Free()
 {
     if ( m_hCursor )
     {
 {
     if ( m_hCursor )
     {

+#ifndef __WXWINCE__

         if ( m_destroyCursor )
             ::DestroyCursor((HCURSOR)m_hCursor);
         if ( m_destroyCursor )
             ::DestroyCursor((HCURSOR)m_hCursor);

+#endif

 
         m_hCursor = 0;
     }
 
         m_hCursor = 0;
     }


@@ -234,9 +237,11 @@ wxCursor::wxCursor(const wxString& filename,
             hcursor = ::LoadCursor(wxGetInstance(), filename);
             break;
 
             hcursor = ::LoadCursor(wxGetInstance(), filename);
             break;
 

+#ifndef __WXWINCE__

         case wxBITMAP_TYPE_CUR:
             hcursor = ::LoadCursorFromFile(filename);
             break;
         case wxBITMAP_TYPE_CUR:
             hcursor = ::LoadCursorFromFile(filename);
             break;

+#endif

 
         case wxBITMAP_TYPE_ICO:
             hcursor = wxBitmapToHCURSOR
 
         case wxBITMAP_TYPE_ICO:
             hcursor = wxBitmapToHCURSOR


@@ -265,10 +270,6 @@ wxCursor::wxCursor(const wxString& filename,
     if ( hcursor )
     {
         m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
     if ( hcursor )
     {
         m_refData = new wxCursorRefData(hcursor, true /* delete it later */);

-
-#if WXWIN_COMPATIBILITY_2
-        ((wxCursorRefData *)m_refData)->SetOk();
-#endif // WXWIN_COMPATIBILITY_2

     }
 }
 
     }
 }