Derive wxWebViewEvent from wxNotifyEvent.

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

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index 92adc678b7b0d88412b44fd04ce2f2f53a8444ce..756677c1cad143a6b496c4e0191ef3e9b96b35aa 100644 (file)
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.cpp
+// Name:        src/os2/cursor.cpp

 // Purpose:     wxCursor class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxCursor class
 // Author:      David Webster
 // Modified by:


@@ -12,19 +12,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"

 #include "wx/cursor.h"
 #include "wx/cursor.h"

-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #include "wx/os2/wxrsc.h"
 #endif
 
 #include "wx/os2/private.h"
 #include "wx/os2/wxrsc.h"

-#include "wx/image.h"

 
 #include "assert.h"
 
 
 #include "assert.h"
 


@@ -53,15 +54,6 @@ wxCursor::wxCursor(void)
 {
 }
 
 {
 }
 

-wxCursor::wxCursor(const char WXUNUSED(bits)[],
-                   int WXUNUSED(width),
-                   int WXUNUSED(height),
-                   int WXUNUSED(hotSpotX),
-                   int WXUNUSED(hotSpotY),
-                   const char WXUNUSED(maskBits)[])
-{
-}
-

 wxCursor::wxCursor(const wxImage& rImage)
 {
     wxImage  vImage32 = rImage.Scale(32,32);
 wxCursor::wxCursor(const wxImage& rImage)
 {
     wxImage  vImage32 = rImage.Scale(32,32);


@@ -94,7 +86,7 @@ wxCursor::wxCursor(const wxImage& rImage)
 } // end of wxCursor::wxCursor
 
 wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
 } // end of wxCursor::wxCursor
 
 wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),

-                    long lFlags,
+                    wxBitmapType type,

                     int WXUNUSED(nHotSpotX),
                     int WXUNUSED(nHotSpotY) )
 {
                     int WXUNUSED(nHotSpotX),
                     int WXUNUSED(nHotSpotY) )
 {


@@ -103,17 +95,19 @@ wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
     pRefData = new wxCursorRefData;
     m_refData = pRefData;
     pRefData->m_bDestroyCursor = false;
     pRefData = new wxCursorRefData;
     m_refData = pRefData;
     pRefData->m_bDestroyCursor = false;

-    if (lFlags == wxBITMAP_TYPE_CUR_RESOURCE)
+    if (type == wxBITMAP_TYPE_CUR_RESOURCE)

     {
         pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
                                                            ,0
     {
         pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
                                                            ,0

-                                                           ,(ULONG)lFlags // if OS/2 this should be the resource Id
+                                                           ,(ULONG)type // if OS/2 this should be the resource Id

                                                           );
     }
                                                           );
     }

+    else
+        wxLogError("Invalid cursor bitmap type '%d'", type);

 } // end of wxCursor::wxCursor
 
 // Cursors by stock number
 } // end of wxCursor::wxCursor
 
 // Cursors by stock number

-wxCursor::wxCursor(int nCursorType)
+void wxCursor::InitFromStock(wxStockCursor nCursorType)

 {
     wxCursorRefData*                pRefData = new wxCursorRefData;
 
 {
     wxCursorRefData*                pRefData = new wxCursorRefData;
 


@@ -308,7 +302,7 @@ void wxSetCursor(const wxCursor& cursor)
 {
     extern wxCursor *g_globalCursor;
 
 {
     extern wxCursor *g_globalCursor;
 

-    if ( cursor.Ok() && cursor.GetHCURSOR() )
+    if ( cursor.IsOk() && cursor.GetHCURSOR() )

     {
 //        ::SetCursor((HCURSOR) cursor.GetHCURSOR());
 
     {
 //        ::SetCursor((HCURSOR) cursor.GetHCURSOR());