wxrcedit improvements

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

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index 4333364c931cc08c781cc38f2998b2fc29bc69c8..6490f0279ed8015cd5bac6373c462a331a63983a 100644 (file)
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -1,41 +1,49 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        cursor.cpp
 // Purpose:     wxCursor class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        cursor.cpp
 // Purpose:     wxCursor class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "cursor.h"
-#endif
+// 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/icon.h"
 #include "wx/cursor.h"
 #include "wx/icon.h"

+#endif
+
+#include "wx/os2/private.h"
+
+#include "assert.h"

 
 

-#if !USE_SHARED_LIBRARIES

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

-#endif

 
 

-wxCursorRefData::wxCursorRefData()
+wxCursorRefData::wxCursorRefData(void)

 {
 {

-    m_width = 32; m_height = 32;
-
-/* TODO
-    m_hCursor = 0 ;
-*/
+  m_nWidth = 32;
+  m_nHeight = 32;
+  m_hCursor = 0 ;
+  m_destroyCursor = FALSE;

 }
 
 }
 

-wxCursorRefData::~wxCursorRefData()
+wxCursorRefData::~wxCursorRefData(void)

 {
 {

-    // TODO: destroy cursor
+//    if ( m_hCursor && m_destroyCursor)
+//        ::DestroyCursor((HICON) m_hCursor);

 }
 
 // Cursors
 }
 
 // Cursors

-wxCursor::wxCursor()
+wxCursor::wxCursor(void)

 {
 }
 
 {
 }
 


@@ -46,142 +54,190 @@ wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSE
 
 wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
 {
 
 wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY)
 {

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

 
 

-    // TODO: create cursor from a file
+  M_CURSORDATA->m_destroyCursor = FALSE;
+  M_CURSORDATA->m_hCursor = 0;
+// 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 (M_CURSORDATA->m_hCursor)
+      M_CURSORDATA->m_ok = TRUE;
+    else
+      M_CURSORDATA->m_ok = FALSE;
+  }
+  else if (flags & wxBITMAP_TYPE_CUR)
+  {
+    M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), cursor_file, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE);
+  }
+  else if (flags & wxBITMAP_TYPE_ICO)
+  {
+  }
+  else if (flags & wxBITMAP_TYPE_BMP)
+  {
+  }
+*/

 }
 
 // Cursors by stock number
 wxCursor::wxCursor(int cursor_type)
 {
   m_refData = new wxCursorRefData;
 }
 
 // Cursors by stock number
 wxCursor::wxCursor(int cursor_type)
 {
   m_refData = new wxCursorRefData;

-
-/* TODO
+// TODO:
+/*

   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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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(), wxT("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;
   }
 */
       break;
   }
 */

+}

 
 

+wxCursor::~wxCursor(void)
+{
+//    FreeResource(TRUE);

 }
 
 }
 

-wxCursor::~wxCursor()
+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;
+//  }
+  return TRUE;
+}
+
+void wxCursor::SetHCURSOR(WXHCURSOR cursor)
+{
+  if ( !M_CURSORDATA )
+    m_refData = new wxCursorRefData;
+
+  M_CURSORDATA->m_hCursor = cursor;

 }
 
 // Global cursor setting
 void wxSetCursor(const wxCursor& cursor)
 {
 }
 
 // Global cursor setting
 void wxSetCursor(const wxCursor& cursor)
 {

-  // TODO (optional on platforms with no global cursor)
-}
+    extern wxCursor *g_globalCursor;

 
 

+    if ( cursor.Ok() && cursor.GetHCURSOR() )
+    {
+//        ::SetCursor((HCURSOR) cursor.GetHCURSOR());
+
+        if ( g_globalCursor )
+            (*g_globalCursor) = cursor;
+    }
+}