wxExecute() fixes and doc updates: the return value for sync exec case is now

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 8eb388fae434a4be42e7680e8ec5543874602e9e..6e8fc77ee2719357f69c30368967cf69a319f0fb 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -34,12 +34,7 @@
 
 #include "assert.h"
 
 
 #include "assert.h"
 

-#if USE_XPM_IN_MSW
-#define FOR_MSW 1
-#include "..\..\contrib\wxxpm\libxpm.34b\lib\xpm34.h"
-#endif
-
-#if USE_RESOURCE_LOADING_IN_MSW
+#if wxUSE_RESOURCE_LOADING_IN_MSW

 #include "wx/msw/curico.h"
 #include "wx/msw/curicop.h"
 #endif
 #include "wx/msw/curico.h"
 #include "wx/msw/curicop.h"
 #endif


@@ -88,21 +83,21 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
   }
   else if (flags & wxBITMAP_TYPE_CUR)
   {
   }
   else if (flags & wxBITMAP_TYPE_CUR)
   {

-#if USE_RESOURCE_LOADING_IN_MSW
+#if wxUSE_RESOURCE_LOADING_IN_MSW

     M_CURSORDATA->m_hCursor = (WXHCURSOR) ReadCursorFile((char *)(const char *)cursor_file, wxGetInstance(), &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
        M_CURSORDATA->m_destroyCursor = TRUE;
 #endif
   }
   else if (flags & wxBITMAP_TYPE_ICO)
   {
     M_CURSORDATA->m_hCursor = (WXHCURSOR) ReadCursorFile((char *)(const char *)cursor_file, wxGetInstance(), &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
        M_CURSORDATA->m_destroyCursor = TRUE;
 #endif
   }
   else if (flags & wxBITMAP_TYPE_ICO)
   {

-#if USE_RESOURCE_LOADING_IN_MSW
+#if wxUSE_RESOURCE_LOADING_IN_MSW

     M_CURSORDATA->m_hCursor = (WXHCURSOR) IconToCursor((char *)(const char *)cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
        M_CURSORDATA->m_destroyCursor = TRUE;
 #endif
   }
   else if (flags & wxBITMAP_TYPE_BMP)
   {
     M_CURSORDATA->m_hCursor = (WXHCURSOR) IconToCursor((char *)(const char *)cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
        M_CURSORDATA->m_destroyCursor = TRUE;
 #endif
   }
   else if (flags & wxBITMAP_TYPE_BMP)
   {

-#if USE_RESOURCE_LOADING_IN_MSW
+#if wxUSE_RESOURCE_LOADING_IN_MSW

     HBITMAP hBitmap = 0;
     HPALETTE hPalette = 0;
     bool success = ReadDIB((char *)(const char *)cursor_file, &hBitmap, &hPalette) != 0;
     HBITMAP hBitmap = 0;
     HPALETTE hPalette = 0;
     bool success = ReadDIB((char *)(const char *)cursor_file, &hBitmap, &hPalette) != 0;


@@ -130,29 +125,29 @@ wxCursor::wxCursor(int cursor_type)
   switch (cursor_type)
   {
     case wxCURSOR_WAIT:
   switch (cursor_type)
   {
     case wxCURSOR_WAIT:

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_WAIT);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_WAIT);

       break;
     case wxCURSOR_IBEAM:
       break;
     case wxCURSOR_IBEAM:

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_IBEAM);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_IBEAM);

       break;
     case wxCURSOR_CROSS:
       break;
     case wxCURSOR_CROSS:

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_CROSS);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_CROSS);

       break;
     case wxCURSOR_SIZENWSE:
       break;
     case wxCURSOR_SIZENWSE:

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_SIZENWSE);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_SIZENWSE);

       break;
     case wxCURSOR_SIZENESW:
       break;
     case wxCURSOR_SIZENESW:

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_SIZENESW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_SIZENESW);

       break;
     case wxCURSOR_SIZEWE:
       break;
     case wxCURSOR_SIZEWE:

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_SIZEWE);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_SIZEWE);

       break;
     case wxCURSOR_SIZENS:
       break;
     case wxCURSOR_SIZENS:

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_SIZENS);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_SIZENS);

       break;
     case wxCURSOR_CHAR:
     {
       break;
     case wxCURSOR_CHAR:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_ARROW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);

       break;
     }
     case wxCURSOR_HAND:
       break;
     }
     case wxCURSOR_HAND:


@@ -182,17 +177,17 @@ wxCursor::wxCursor(int cursor_type)
     }
     case wxCURSOR_LEFT_BUTTON:
     {
     }
     case wxCURSOR_LEFT_BUTTON:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_ARROW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);

       break;
     }
     case wxCURSOR_RIGHT_BUTTON:
     {
       break;
     }
     case wxCURSOR_RIGHT_BUTTON:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_ARROW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);

       break;
     }
     case wxCURSOR_MIDDLE_BUTTON:
     {
       break;
     }
     case wxCURSOR_MIDDLE_BUTTON:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_ARROW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);

       break;
     }
     case wxCURSOR_SIZING:
       break;
     }
     case wxCURSOR_SIZING:


@@ -237,7 +232,7 @@ wxCursor::wxCursor(int cursor_type)
     }
     default:
     case wxCURSOR_ARROW:
     }
     default:
     case wxCURSOR_ARROW:

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_ARROW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);

       break;
   }
 }
       break;
   }
 }


@@ -247,7 +242,7 @@ wxCursor::~wxCursor(void)
 //     FreeResource(TRUE);
 }
 
 //     FreeResource(TRUE);
 }
 

-bool wxCursor::FreeResource(bool force)
+bool wxCursor::FreeResource(bool WXUNUSED(force))

 {
   if (M_CURSORDATA && M_CURSORDATA->m_hCursor && M_CURSORDATA->m_destroyCursor)
   {
 {
   if (M_CURSORDATA && M_CURSORDATA->m_hCursor && M_CURSORDATA->m_destroyCursor)
   {