added wxGetMultiChoice() (which refuses to work for some reason - will fix

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

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index b55237c68b4f067e6a7e3329f066e3ede13d8034..6490f0279ed8015cd5bac6373c462a331a63983a 100644 (file)
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -26,13 +26,12 @@
 
 #include "assert.h"
 
 
 #include "assert.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)

-#endif

 
 wxCursorRefData::wxCursorRefData(void)
 {
 
 wxCursorRefData::wxCursorRefData(void)
 {

-  m_width = 32; m_height = 32;
+  m_nWidth = 32;
+  m_nHeight = 32;

   m_hCursor = 0 ;
   m_destroyCursor = FALSE;
 }
   m_hCursor = 0 ;
   m_destroyCursor = FALSE;
 }


@@ -59,9 +58,9 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
 
   M_CURSORDATA->m_destroyCursor = FALSE;
   M_CURSORDATA->m_hCursor = 0;
 
   M_CURSORDATA->m_destroyCursor = FALSE;
   M_CURSORDATA->m_hCursor = 0;

-  M_CURSORDATA->m_ok = FALSE;

 // TODO:
 /*
 // TODO:
 /*

+  M_CURSORDATA->m_bOK = FALSE;

   if (flags & wxBITMAP_TYPE_CUR_RESOURCE)
   {
     M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), cursor_file, IMAGE_CURSOR, 0, 0, 0);
   if (flags & wxBITMAP_TYPE_CUR_RESOURCE)
   {
     M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), cursor_file, IMAGE_CURSOR, 0, 0, 0);