Just a teeny change -- addition of wxFrame::IsMaximized. For wxMDIChildFrame

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index f4e2a399e217a72c1f5e4648eb2ada43bca8e875..144c728fae3e603297a54bb18cbb9a19fb8ed2c5 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -34,12 +34,12 @@
 
 #include "assert.h"
 
 
 #include "assert.h"
 

-#if USE_XPM_IN_MSW
+#if wxUSE_XPM_IN_MSW

 #define FOR_MSW 1
 #define FOR_MSW 1

-#include "..\..\contrib\wxxpm\libxpm.34b\lib\xpm34.h"
+#include "../src/xpm/xpm34.h"

 #endif
 
 #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,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
+#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;
     HBITMAP hBitmap = 0;
     HPALETTE hPalette = 0;

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

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