MDI child maximize bug fixed

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index f4e2a399e217a72c1f5e4648eb2ada43bca8e875..3ad8200c699c9a1a67c9a7cba1a3ea847aae2ad3 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
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -27,6 +27,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/cursor.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/cursor.h"

+#include "wx/icon.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -34,12 +35,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


@@ -57,8 +53,12 @@ wxCursorRefData::wxCursorRefData(void)
 
 wxCursorRefData::~wxCursorRefData(void)
 {
 
 wxCursorRefData::~wxCursorRefData(void)
 {

-       if ( m_hCursor && m_destroyCursor)
-               ::DestroyCursor((HICON) m_hCursor);
+    if ( m_hCursor && m_destroyCursor)
+#ifdef __WXWINE__
+        ::DestroyCursor((HCURSOR) m_hCursor);
+#else
+        ::DestroyCursor((HICON) m_hCursor);
+#endif

 }
 
 // Cursors
 }
 
 // Cursors


@@ -88,24 +88,24 @@ 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
-    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;
+#if wxUSE_RESOURCE_LOADING_IN_MSW
+    M_CURSORDATA->m_hCursor = (WXHCURSOR) ReadCursorFile(WXSTRINGCAST cursor_file, wxGetInstance(), &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
+    M_CURSORDATA->m_destroyCursor = TRUE;

 #endif
   }
   else if (flags & wxBITMAP_TYPE_ICO)
   {
 #endif
   }
   else if (flags & wxBITMAP_TYPE_ICO)
   {

-#if USE_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;
+#if wxUSE_RESOURCE_LOADING_IN_MSW
+    M_CURSORDATA->m_hCursor = (WXHCURSOR) IconToCursor(WXSTRINGCAST 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)
   {
 #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;
     HBITMAP hBitmap = 0;
     HPALETTE hPalette = 0;

-    bool success = ReadDIB((char *)(const char *)cursor_file, &hBitmap, &hPalette);
+    bool success = ReadDIB(WXSTRINGCAST cursor_file, &hBitmap, &hPalette) != 0;

     if (!success)
       return;
     if (hPalette)
     if (!success)
       return;
     if (hPalette)


@@ -114,7 +114,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);
     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;
     DeleteObject(hBitmap);
     if (M_CURSORDATA->m_hCursor)
       M_CURSORDATA->m_ok = TRUE;


@@ -130,129 +130,129 @@ 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:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_HAND");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_HAND"));

       break;
     }
     case wxCURSOR_BULLSEYE:
     {
       break;
     }
     case wxCURSOR_BULLSEYE:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_BULLSEYE");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_BULLSEYE"));

       break;
     }
     case wxCURSOR_PENCIL:
     {
       break;
     }
     case wxCURSOR_PENCIL:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_PENCIL");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_PENCIL"));

       break;
     }
     case wxCURSOR_MAGNIFIER:
     {
       break;
     }
     case wxCURSOR_MAGNIFIER:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_MAGNIFIER");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_MAGNIFIER"));

       break;
     }
     case wxCURSOR_NO_ENTRY:
     {
       break;
     }
     case wxCURSOR_NO_ENTRY:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_NO_ENTRY");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_NO_ENTRY"));

       break;
     }
     case wxCURSOR_LEFT_BUTTON:
     {
       break;
     }
     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:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_SIZING");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_SIZING"));

       break;
     }
     case wxCURSOR_WATCH:
     {
       break;
     }
     case wxCURSOR_WATCH:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_WATCH");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_WATCH"));

       break;
     }
     case wxCURSOR_SPRAYCAN:
     {
       break;
     }
     case wxCURSOR_SPRAYCAN:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_ROLLER");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_ROLLER"));

       break;
     }
     case wxCURSOR_PAINT_BRUSH:
     {
       break;
     }
     case wxCURSOR_PAINT_BRUSH:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_PBRUSH");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_PBRUSH"));

       break;
     }
     case wxCURSOR_POINT_LEFT:
     {
       break;
     }
     case wxCURSOR_POINT_LEFT:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_PLEFT");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_PLEFT"));

       break;
     }
     case wxCURSOR_POINT_RIGHT:
     {
       break;
     }
     case wxCURSOR_POINT_RIGHT:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_PRIGHT");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_PRIGHT"));

       break;
     }
     case wxCURSOR_QUESTION_ARROW:
     {
       break;
     }
     case wxCURSOR_QUESTION_ARROW:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_QARROW");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_QARROW"));

       break;
     }
     case wxCURSOR_BLANK:
     {
       break;
     }
     case wxCURSOR_BLANK:
     {

-      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), "wxCURSOR_BLANK");
+      M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), _T("wxCURSOR_BLANK"));

       break;
     }
     default:
     case wxCURSOR_ARROW:
       break;
     }
     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)
 {
       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);
 {
   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;
 }
   }
   return TRUE;
 }


@@ -260,7 +260,7 @@ bool wxCursor::FreeResource(bool force)
 void wxCursor::SetHCURSOR(WXHCURSOR cursor)
 {
   if ( !M_CURSORDATA )
 void wxCursor::SetHCURSOR(WXHCURSOR cursor)
 {
   if ( !M_CURSORDATA )

-       m_refData = new wxCursorRefData;
+    m_refData = new wxCursorRefData;

 
   M_CURSORDATA->m_hCursor = cursor;
 }
 
   M_CURSORDATA->m_hCursor = cursor;
 }


@@ -268,12 +268,15 @@ void wxCursor::SetHCURSOR(WXHCURSOR cursor)
 // Global cursor setting
 void wxSetCursor(const wxCursor& 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;
+    }

 }
 
 
 }