Added ability to execute more code after the widget is created

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index bf69c83f6d20b4c2b316482dfbe6425085a9e66c..bd27803b409b3af552df65d922d5ea929c02193b 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
 


@@ -155,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;
     }


@@ -170,6 +172,7 @@ wxCursor::wxCursor()
 {
 }
 
 {
 }
 

+#if wxUSE_IMAGE

 wxCursor::wxCursor(const wxImage& image)
 {
     // image has to be of the standard cursor size, otherwise we won't be able
 wxCursor::wxCursor(const wxImage& image)
 {
     // image has to be of the standard cursor size, otherwise we won't be able


@@ -177,8 +180,8 @@ wxCursor::wxCursor(const wxImage& image)
     const int w = wxCursorRefData::GetStandardWidth();
     const int h = wxCursorRefData::GetStandardHeight();
 
     const int w = wxCursorRefData::GetStandardWidth();
     const int h = wxCursorRefData::GetStandardHeight();
 

-    const int hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
-    const int hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
+    const int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+    const int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);

 
     wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < w &&
                     hotSpotY >= 0 && hotSpotY < h,
 
     wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < w &&
                     hotSpotY >= 0 && hotSpotY < h,


@@ -198,6 +201,7 @@ wxCursor::wxCursor(const wxImage& image)
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }

+#endif

 
 wxCursor::wxCursor(const char WXUNUSED(bits)[],
                    int WXUNUSED(width),
 
 wxCursor::wxCursor(const char WXUNUSED(bits)[],
                    int WXUNUSED(width),


@@ -235,9 +239,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


@@ -266,10 +272,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

     }
 }
 
     }
 }
 


@@ -288,31 +290,31 @@ wxCursor::wxCursor(int idCursor)
     {
         {  true, NULL                        }, // wxCURSOR_NONE
         {  true, IDC_ARROW                   }, // wxCURSOR_ARROW
     {
         {  true, NULL                        }, // wxCURSOR_NONE
         {  true, IDC_ARROW                   }, // wxCURSOR_ARROW

-        { false, _T("wxCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
-        { false, _T("wxCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
-        {  true, IDC_ARROW                   }, // wxCURSOR_CHAR
-        {  true, IDC_CROSS                   }, // wxCURSOR_CROSS
-        { false, _T("wxCURSOR_HAND")         }, // wxCURSOR_HAND
-        {  true, IDC_IBEAM                   }, // wxCURSOR_IBEAM
-        {  true, IDC_ARROW                   }, // wxCURSOR_LEFT_BUTTON
-        { false, _T("wxCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
-        {  true, IDC_ARROW                   }, // wxCURSOR_MIDDLE_BUTTON
-        {  true, IDC_NO                      }, // wxCURSOR_NO_ENTRY
-        { false, _T("wxCURSOR_PAINT_BRUSH")  }, // wxCURSOR_PAINT_BRUSH
-        { false, _T("wxCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
-        { false, _T("wxCURSOR_POINT_LEFT")   }, // wxCURSOR_POINT_LEFT
-        { false, _T("wxCURSOR_POINT_RIGHT")  }, // wxCURSOR_POINT_RIGHT
-        {  true, IDC_HELP                    }, // wxCURSOR_QUESTION_ARROW
-        {  true, IDC_ARROW                   }, // wxCURSOR_RIGHT_BUTTON
-        {  true, IDC_SIZENESW                }, // wxCURSOR_SIZENESW
-        {  true, IDC_SIZENS                  }, // wxCURSOR_SIZENS
-        {  true, IDC_SIZENWSE                }, // wxCURSOR_SIZENWSE
-        {  true, IDC_SIZEWE                  }, // wxCURSOR_SIZEWE
-        {  true, IDC_SIZEALL                 }, // wxCURSOR_SIZING
-        { false, _T("wxCURSOR_SPRAYCAN")     }, // wxCURSOR_SPRAYCAN
-        {  true, IDC_WAIT                    }, // wxCURSOR_WAIT
-        {  true, IDC_WAIT                    }, // wxCURSOR_WATCH
-        { false, _T("wxCURSOR_BLANK")        }, // wxCURSOR_BLANK
+        { false, _T("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
+        { false, _T("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
+        {  true, IDC_ARROW                   }, // WXCURSOR_CHAR
+        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
+        { false, _T("WXCURSOR_HAND")         }, // wxCURSOR_HAND
+        {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
+        {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON
+        { false, _T("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
+        {  true, IDC_ARROW                   }, // WXCURSOR_MIDDLE_BUTTON
+        {  true, IDC_NO                      }, // WXCURSOR_NO_ENTRY
+        { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_PAINT_BRUSH
+        { false, _T("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
+        { false, _T("WXCURSOR_PLEFT")        }, // wxCURSOR_POINT_LEFT
+        { false, _T("WXCURSOR_PRIGHT")       }, // wxCURSOR_POINT_RIGHT
+        {  true, IDC_HELP                    }, // WXCURSOR_QUESTION_ARROW
+        {  true, IDC_ARROW                   }, // WXCURSOR_RIGHT_BUTTON
+        {  true, IDC_SIZENESW                }, // WXCURSOR_SIZENESW
+        {  true, IDC_SIZENS                  }, // WXCURSOR_SIZENS
+        {  true, IDC_SIZENWSE                }, // WXCURSOR_SIZENWSE
+        {  true, IDC_SIZEWE                  }, // WXCURSOR_SIZEWE
+        {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
+        { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
+        {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
+        { false, _T("WXCURSOR_WATCH")        }, // WXCURSOR_WATCH
+        { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK

         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
 
         // no entry for wxCURSOR_MAX
         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
 
         // no entry for wxCURSOR_MAX