Added dummy OnIdle to wxWindow in wxGTK; doc tweaks

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 3a3c09aa70eb31a19158f472599456ac7716a60c..fdbcc955b8b57c29cab9bdeb07fb830b7d65799e 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -34,11 +34,6 @@
 
 #include "assert.h"
 
-#if wxUSE_XPM_IN_MSW
-#define FOR_MSW 1
-#include "..\..\contrib\wxxpm\libxpm.34b\lib\xpm34.h"
-#endif
-
 #if wxUSE_RESOURCE_LOADING_IN_MSW
 #include "wx/msw/curico.h"
 #include "wx/msw/curicop.h"
@@ -57,8 +52,8 @@ wxCursorRefData::wxCursorRefData(void)
 
 wxCursorRefData::~wxCursorRefData(void)
 {
-       if ( m_hCursor && m_destroyCursor)
-               ::DestroyCursor((HICON) m_hCursor);
+    if ( m_hCursor && m_destroyCursor)
+        ::DestroyCursor((HICON) m_hCursor);
 }
 
 // Cursors
@@ -90,14 +85,14 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
   {
 #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;
+    M_CURSORDATA->m_destroyCursor = TRUE;
 #endif
   }
   else if (flags & wxBITMAP_TYPE_ICO)
   {
 #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;
+    M_CURSORDATA->m_destroyCursor = TRUE;
 #endif
   }
   else if (flags & wxBITMAP_TYPE_BMP)
@@ -114,7 +109,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
     pnt.x = hotSpotX;
     pnt.y = hotSpotY;
     M_CURSORDATA->m_hCursor = (WXHCURSOR) MakeCursorFromBitmap(wxGetInstance(), hBitmap, &pnt);
-       M_CURSORDATA->m_destroyCursor = TRUE;
+    M_CURSORDATA->m_destroyCursor = TRUE;
     DeleteObject(hBitmap);
     if (M_CURSORDATA->m_hCursor)
       M_CURSORDATA->m_ok = TRUE;
@@ -130,29 +125,29 @@ wxCursor::wxCursor(int cursor_type)
   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:
-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_IBEAM);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_IBEAM);
       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:
-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_SIZENWSE);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_SIZENWSE);
       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:
-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_SIZEWE);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_SIZEWE);
       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:
     {
-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_ARROW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
       break;
     }
     case wxCURSOR_HAND:
@@ -182,17 +177,17 @@ wxCursor::wxCursor(int cursor_type)
     }
     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:
     {
-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_ARROW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
       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:
@@ -237,22 +232,22 @@ wxCursor::wxCursor(int cursor_type)
     }
     default:
     case wxCURSOR_ARROW:
-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(NULL, IDC_ARROW);
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
       break;
   }
 }
 
 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)
   {
     DestroyCursor((HCURSOR) M_CURSORDATA->m_hCursor);
-       M_CURSORDATA->m_hCursor = 0;
+    M_CURSORDATA->m_hCursor = 0;
   }
   return TRUE;
 }
@@ -260,7 +255,7 @@ bool wxCursor::FreeResource(bool force)
 void wxCursor::SetHCURSOR(WXHCURSOR cursor)
 {
   if ( !M_CURSORDATA )
-       m_refData = new wxCursorRefData;
+    m_refData = new wxCursorRefData;
 
   M_CURSORDATA->m_hCursor = cursor;
 }
@@ -268,12 +263,15 @@ void wxCursor::SetHCURSOR(WXHCURSOR cursor)
 // Global cursor setting
 void wxSetCursor(const wxCursor& cursor)
 {
-  extern wxCursor *g_globalCursor;
-  if ( g_globalCursor )
-    (*g_globalCursor) = cursor;
+    extern wxCursor *g_globalCursor;
 
-  if (cursor.Ok() && cursor.GetHCURSOR())
-    ::SetCursor((HCURSOR) cursor.GetHCURSOR());
+    if ( cursor.Ok() && cursor.GetHCURSOR() )
+    {
+        ::SetCursor((HCURSOR) cursor.GetHCURSOR());
+
+        if ( g_globalCursor )
+            (*g_globalCursor) = cursor;
+    }
 }