Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 66b2925bec8b8456dd1ad7e5cbb75570bd60e66b..56b1b840ca59f6f85436ed0b8fe5fc883cddc5ae 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -1,29 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "cursor.h"
-#endif
-

 // 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 "wx/list.h"
+#endif
+

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

-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/list.h"
-#include "wx/window.h"
-#if wxUSE_IMAGE
-#include "wx/image.h"
-#endif                                                                      
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/image.h"
+    #include "wx/log.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -47,17 +48,23 @@ public:
 
 WX_DECLARE_LIST(wxXCursor, wxXCursorList);
 #include "wx/listimpl.cpp"
 
 WX_DECLARE_LIST(wxXCursor, wxXCursorList);
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxXCursorList);
+WX_DEFINE_LIST(wxXCursorList)

 
 

-class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
+class WXDLLEXPORT wxCursorRefData: public wxGDIRefData

 {
 {

-    friend class WXDLLEXPORT wxCursor;

 public:
     wxCursorRefData();
 public:
     wxCursorRefData();

-    ~wxCursorRefData();
-    
+    virtual ~wxCursorRefData();
+

     wxXCursorList m_cursors;  // wxXCursor objects, one per display
     wxStockCursor m_cursorId; // wxWidgets standard cursor id
     wxXCursorList m_cursors;  // wxXCursor objects, one per display
     wxStockCursor m_cursorId; // wxWidgets standard cursor id

+
+private:
+    // There is no way to copy m_cursor so we can't implement a copy ctor
+    // properly.
+    wxDECLARE_NO_COPY_CLASS(wxCursorRefData);
+
+    friend class wxCursor;

 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)


@@ -98,7 +105,8 @@ wxCursor::wxCursor(const wxImage & image)
     unsigned char * bits = new unsigned char [imagebitcount];
     unsigned char * maskBits = new unsigned char [imagebitcount];
 
     unsigned char * bits = new unsigned char [imagebitcount];
     unsigned char * maskBits = new unsigned char [imagebitcount];
 

-    int i, j, i8; unsigned char c, cMask;
+    int i, j, i8;
+    unsigned char c, cMask;

     for (i=0; i<imagebitcount; i++)
     {
         bits[i] = 0xff;
     for (i=0; i<imagebitcount; i++)
     {
         bits[i] = 0xff;


@@ -108,11 +116,11 @@ wxCursor::wxCursor(const wxImage & image)
         for (j=0; j<8; j++)
         {
             // possible overflow if we do the summation first ?
         for (j=0; j<8; j++)
         {
             // possible overflow if we do the summation first ?

-            c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3;
-            //if average value is > mid grey
+            c = (unsigned char)(rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3);
+            // if average value is > mid grey

             if (c>127)
                 bits[i] = bits[i] & cMask;
             if (c>127)
                 bits[i] = bits[i] & cMask;

-            cMask = (cMask << 1) | 1;
+            cMask = (unsigned char)((cMask << 1) | 1);

         }
     }
 
         }
     }
 


@@ -133,7 +141,7 @@ wxCursor::wxCursor(const wxImage & image)
             {
                 if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
                     maskBits[i] = maskBits[i] | cMask;
             {
                 if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
                     maskBits[i] = maskBits[i] | cMask;

-                cMask = (cMask << 1);
+                cMask = (unsigned char)(cMask << 1);

             }
         }
     }
             }
         }
     }


@@ -223,7 +231,7 @@ void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap,
                                   (Pixmap)mask_pixmap,
                                   &foreground_color,
                                   &background_color,
                                   (Pixmap)mask_pixmap,
                                   &foreground_color,
                                   &background_color,

-                                  hotSpotX , 
+                                  hotSpotX ,

                                   hotSpotY);
 
     if (cursor)
                                   hotSpotY);
 
     if (cursor)


@@ -237,16 +245,20 @@ void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap,
 }
 
 wxCursor::wxCursor(const char bits[], int width, int height,
 }
 
 wxCursor::wxCursor(const char bits[], int width, int height,

-                   int hotSpotX, int hotSpotY, const char maskBits[])
+                   int hotSpotX, int hotSpotY, const char maskBits[] ,
+                   const wxColour* WXUNUSED(fg), const wxColour* WXUNUSED(bg) )

 {
     Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
 }
 
 {
     Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
 }
 

-wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
+wxCursor::wxCursor(const wxString& name, wxBitmapType type,
+                   int hotSpotX, int hotSpotY)

 {
     // Must be an XBM file
 {
     // Must be an XBM file

-    if (flags != wxBITMAP_TYPE_XBM)
+    if (type != wxBITMAP_TYPE_XBM) {
+        wxLogError("Invalid cursor bitmap type '%d'", type);

         return;
         return;

+    }

 
     m_refData = new wxCursorRefData;
 
 
     m_refData = new wxCursorRefData;
 


@@ -258,7 +270,7 @@ wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
     int screen_num =  DefaultScreen (dpy);
 
     int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),
     int screen_num =  DefaultScreen (dpy);
 
     int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),

-                                 wxConstCast(name.c_str(), char),
+                                 name.mb_str(),

                                  &w, &h, &pixmap, &hotX, &hotY);
 
     if (value == BitmapSuccess)
                                  &w, &h, &pixmap, &hotX, &hotY);
 
     if (value == BitmapSuccess)


@@ -282,7 +294,7 @@ wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
 }
 
 // Cursors by stock number
 }
 
 // Cursors by stock number

-wxCursor::wxCursor(wxStockCursor id)
+void wxCursor::InitFromStock(wxStockCursor id)

 {
     m_refData = new wxCursorRefData;
     M_CURSORDATA->m_cursorId = id;
 {
     m_refData = new wxCursorRefData;
     M_CURSORDATA->m_cursorId = id;


@@ -292,9 +304,17 @@ wxCursor::~wxCursor()
 {
 }
 
 {
 }
 

-bool wxCursor::Ok() const
+wxGDIRefData *wxCursor::CreateGDIRefData() const
+{
+    return new wxCursorRefData;
+}
+
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const

 {
 {

-    return m_refData != NULL;
+    wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxMotif.") );
+
+    return new wxCursorRefData;

 }
 
 // Motif-specific: create/get a cursor for the current display
 }
 
 // Motif-specific: create/get a cursor for the current display


@@ -341,17 +361,18 @@ WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id) const
 
     switch (id)
     {
 
     switch (id)
     {

+    case wxCURSOR_CHAR:             return (WXCursor)cursor;
+

     case wxCURSOR_WAIT:             x_cur = XC_watch; break;
     case wxCURSOR_WAIT:             x_cur = XC_watch; break;

-    case wxCURSOR_CROSS:            x_cur = XC_crosshair; break; 
-    case wxCURSOR_CHAR:                       return (WXCursor)cursor; break;
+    case wxCURSOR_CROSS:            x_cur = XC_crosshair; break;

     case wxCURSOR_HAND:             x_cur = XC_hand1; break;
     case wxCURSOR_BULLSEYE:         x_cur = XC_target; break;
     case wxCURSOR_HAND:             x_cur = XC_hand1; break;
     case wxCURSOR_BULLSEYE:         x_cur = XC_target; break;

-    case wxCURSOR_PENCIL:           x_cur = XC_pencil; break; 
-    case wxCURSOR_MAGNIFIER:        x_cur = XC_sizing; break; 
-    case wxCURSOR_IBEAM:            x_cur = XC_xterm; break; 
+    case wxCURSOR_PENCIL:           x_cur = XC_pencil; break;
+    case wxCURSOR_MAGNIFIER:        x_cur = XC_sizing; break;
+    case wxCURSOR_IBEAM:            x_cur = XC_xterm; break;

     case wxCURSOR_NO_ENTRY:         x_cur = XC_pirate; break;
     case wxCURSOR_NO_ENTRY:         x_cur = XC_pirate; break;

-    case wxCURSOR_LEFT_BUTTON:      x_cur = XC_leftbutton; break; 
-    case wxCURSOR_RIGHT_BUTTON:     x_cur = XC_rightbutton; break; 
+    case wxCURSOR_LEFT_BUTTON:      x_cur = XC_leftbutton; break;
+    case wxCURSOR_RIGHT_BUTTON:     x_cur = XC_rightbutton; break;

     case wxCURSOR_MIDDLE_BUTTON:    x_cur =  XC_middlebutton; break;
     case wxCURSOR_QUESTION_ARROW:   x_cur = XC_question_arrow; break;
     case wxCURSOR_SIZING:           x_cur = XC_sizing; break;
     case wxCURSOR_MIDDLE_BUTTON:    x_cur =  XC_middlebutton; break;
     case wxCURSOR_QUESTION_ARROW:   x_cur = XC_question_arrow; break;
     case wxCURSOR_SIZING:           x_cur = XC_sizing; break;


@@ -428,7 +449,7 @@ static int wxBusyCursorCount = 0;
 
 // Helper function
 static void
 
 // Helper function
 static void

-wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
+wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor)

 {
     Display *display = (Display*) win->GetXDisplay();
 
 {
     Display *display = (Display*) win->GetXDisplay();
 


@@ -445,7 +466,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
     else
     {
         // Restore old cursor
     else
     {
         // Restore old cursor

-        if (win->GetCursor().Ok())
+        if (win->GetCursor().IsOk())

             attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);
         else
             attrs.cursor = None;
             attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);
         else
             attrs.cursor = None;


@@ -455,7 +476,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 
     XFlush (display);
 
 
     XFlush (display);
 

-    for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node; 
+    for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node;

         node = node->GetNext())
     {
         wxWindow *child = node->GetData ();
         node = node->GetNext())
     {
         wxWindow *child = node->GetData ();


@@ -464,7 +485,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 }
 
 // Set the cursor to the busy cursor for all windows
 }
 
 // Set the cursor to the busy cursor for all windows

-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)

 {
     wxBusyCursorCount++;
     if (wxBusyCursorCount == 1)
 {
     wxBusyCursorCount++;
     if (wxBusyCursorCount == 1)