use wxStockCursor (as documented and as already implemented in wxMotif) instead of...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h
index eb220b9fa7007201e49627197fa2f21466e25b4b..df2c381ca1d00ff1c6e90217e8ad254ca51633a0 100644 (file)
--- a/include/wx/cocoa/cursor.h
+++ b/include/wx/cocoa/cursor.h
@@ -46,7 +46,7 @@ public:
     wxCursor(const wxString& name, long flags = 0,
              int hotSpotX = 0, int hotSpotY = 0);
 
-    wxCursor(int cursor_type);
+    wxCursor(wxStockCursor cursor_type);
     virtual ~wxCursor();
 
     // FIXME: operator==() is wrong!

diff --git a/include/wx/dfb/cursor.h b/include/wx/dfb/cursor.h
index 102fab41a99dba98748c13607a944ecbec696266..118d8567166ed52fadfcb7335764c576fedc991b 100644 (file)
--- a/include/wx/dfb/cursor.h
+++ b/include/wx/dfb/cursor.h
@@ -24,7 +24,7 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
     wxCursor() {}
-    wxCursor(int cursorId);
+    wxCursor(wxStockCursor cursorId);
     wxCursor(const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0);

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 8269c070484990036f6a79db795ed52fecf92115..c721480ddef1944069b5c69b69c20d7bcaadd724 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
     wxCursor();
-    wxCursor( int cursorId );
+    wxCursor( wxStockCursor cursorId );
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 2612a6c8d2f46e42d4c61f0abb39ea253f90f4ad..361f3e997edad5557e2e826c53989be61fd3d200 100644 (file)
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
     wxCursor();
-    wxCursor( int cursorId );
+    wxCursor( wxStockCursor cursorId );
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif

diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index 31109db1528765fd9b396e40186a64a902b95560..cb26186fad4d3bf7d5b6ecd570fba388a9cd80ae 100644 (file)
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -24,7 +24,7 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 public:
 
     wxCursor();
-    wxCursor(int cursorId);
+    wxCursor(wxStockCursor cursorId);
     wxCursor(const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0);

diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h
index 224973683824f94ace7bf28b25415e04aaf96f52..559390b92edfe710bba4eb34435b24d76d2d58b5 100644 (file)
--- a/include/wx/msw/cursor.h
+++ b/include/wx/msw/cursor.h
@@ -29,7 +29,7 @@ public:
     wxCursor(const wxString& name,
              long flags = wxBITMAP_TYPE_CUR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
-    wxCursor(int idCursor);
+    wxCursor(wxStockCursor idCursor);
     virtual ~wxCursor();
 
     // implementation only

diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index f91cb7dd0425322f81a2f76b0996b20300144410..02956942e2da851f3b2fa26b45cd14f94f37bb3a 100644 (file)
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -46,7 +46,7 @@ public:
              ,int             nHotSpotX = 0
              ,int             nHotSpotY = 0
             );
-    wxCursor(int nCursorType);
+    wxCursor(wxStockCursor nCursorType);
     inline ~wxCursor() { }
 
     inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }

diff --git a/include/wx/osx/carbon/cursor.h b/include/wx/osx/carbon/cursor.h
index 9a7b05715a2c7c954e3745e1c336b396b096df66..97c3a0a2df58c7ace960fe79f452d83788dd1c46 100644 (file)
--- a/include/wx/osx/carbon/cursor.h
+++ b/include/wx/osx/carbon/cursor.h
@@ -30,7 +30,7 @@ public:
              wxBitmapType flags = wxBITMAP_TYPE_MACCURSOR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
 
-    wxCursor(int cursor_type);
+    wxCursor(wxStockCursor cursor_type);
     virtual ~wxCursor();
 
     bool CreateFromXpm(const char* const* bits);

diff --git a/include/wx/palmos/cursor.h b/include/wx/palmos/cursor.h
index 4f76be6560790dea8576640f03ff39debaf9e372..0281f344ecb0e62a6f1067b4c9436482ee8660ca 100644 (file)
--- a/include/wx/palmos/cursor.h
+++ b/include/wx/palmos/cursor.h
@@ -29,7 +29,7 @@ public:
     wxCursor(const wxString& name,
              long flags = wxBITMAP_TYPE_CUR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
-    wxCursor(int idCursor);
+    wxCursor(wxStockCursor idCursor);
     virtual ~wxCursor();
 
     // implementation only

diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h
index 01849e808589d3cbfc53f7a627ebce5095b1b5c3..a674fe469670946624bbadc5ab3dc3aa473c7c78 100644 (file)
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/cursor.h
@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
     wxCursor();
-    wxCursor( int cursorId );
+    wxCursor( wxStockCursor cursorId );
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif

diff --git a/src/dfb/cursor.cpp b/src/dfb/cursor.cpp
index 0751f9ae4e131c07e0f558685095e538c9f79a00..a7dcccf3ec63dc4230fe5ef0c806297b5b4db2c5 100644 (file)
--- a/src/dfb/cursor.cpp
+++ b/src/dfb/cursor.cpp
@@ -43,7 +43,7 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject)
 
-wxCursor::wxCursor(int cursorId)
+wxCursor::wxCursor(wxStockCursor cursorId)
 {
 #warning "FIXME -- implement the cursor as bitmaps (that's what DFB uses)"
 }

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 8e9c50a44e410e7634233c56e7d3ee1aca06b1cb..21f9023d29fef6eefe3f369bab87a51323fd4125 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -56,7 +56,7 @@ wxCursor::wxCursor()
 {
 }
 
-wxCursor::wxCursor( int cursorId )
+wxCursor::wxCursor( wxStockCursor cursorId )
 {
     m_refData = new wxCursorRefData();
 

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 3b14510edbbe134402f11879372c9c67a798e749..64bd4296628ee366eb28837348a93872fd92ee8e 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -61,7 +61,7 @@ wxCursor::wxCursor()
 
 }
 
-wxCursor::wxCursor( int cursorId )
+wxCursor::wxCursor( wxStockCursor cursorId )
 {
     m_refData = new wxCursorRefData();
 

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index b43d0b254b3c3c7a7ee199312d0c9f454559eb8d..0f5a9a3811c1a634c3a48737d3f84d067c30493b 100644 (file)
--- a/src/mgl/cursor.cpp
+++ b/src/mgl/cursor.cpp
@@ -65,7 +65,7 @@ wxCursor::wxCursor()
 {
 }
 
-wxCursor::wxCursor(int cursorId)
+wxCursor::wxCursor(wxStockCursor cursorId)
 {
     if ( !gs_cursorsHash )
         gs_cursorsHash = new wxCursorsHash;

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 5e0bb783f9277d6dd82cdc0068f99d25edea90dc..11515894a76a751cc03b306c8beab65736cd311e 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -292,7 +292,7 @@ wxCursor::wxCursor(const wxString& filename,
 }
 
 // Cursors by stock number
-wxCursor::wxCursor(int idCursor)
+wxCursor::wxCursor(wxStockCursor idCursor)
 {
     // all wxWidgets standard cursors
     static const struct StdCursor

diff --git a/src/os2/cursor.cpp b/src/os2/cursor.cpp
index 24fbc16ea100bc79880c54c8d923f50b03481e51..b932b204ef78144cd6c1f6c0410c5b20802a0c46 100644 (file)
--- a/src/os2/cursor.cpp
+++ b/src/os2/cursor.cpp
@@ -113,7 +113,7 @@ wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
 } // end of wxCursor::wxCursor
 
 // Cursors by stock number
-wxCursor::wxCursor(int nCursorType)
+wxCursor::wxCursor(wxStockCursor nCursorType)
 {
     wxCursorRefData*                pRefData = new wxCursorRefData;
 

diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp
index 4b39a42024dbea26df7024f4379217e58e51a9e7..89c524a32b4b3d04631dc7fad533f5f234ad7ed8 100644 (file)
--- a/src/osx/carbon/cursor.cpp
+++ b/src/osx/carbon/cursor.cpp
@@ -355,7 +355,7 @@ void wxCursor::CreateFromImage(const wxImage & image)
     CGImageRef cgimage = wxMacCreateCGImageFromBitmap(bmp);
     if ( cgimage )
     {
-        M_CURSORDATA->m_hCursor = wxMacCocoaCreateCursorFromCGImage( cgimage, hotSpotX, hotSpotY ); 
+        M_CURSORDATA->m_hCursor = wxMacCocoaCreateCursorFromCGImage( cgimage, hotSpotX, hotSpotY );
         CFRelease( cgimage );
     }
 #elif wxOSX_USE_CARBON
@@ -556,7 +556,7 @@ wxCursor::wxCursor(const wxString& cursor_file, wxBitmapType flags, int hotSpotX
 }
 
 // Cursors by stock number
-wxCursor::wxCursor(int cursor_type)
+wxCursor::wxCursor(wxStockCursor cursor_type)
 {
     m_refData = new wxCursorRefData;
 #if wxOSX_USE_COCOA

diff --git a/src/palmos/cursor.cpp b/src/palmos/cursor.cpp
index 9bb3776db3a9f57db8950d79e7e47a8f5cb8121d..ca22a20e548d51bac50e11b63fbf5f0e44341ec5 100644 (file)
--- a/src/palmos/cursor.cpp
+++ b/src/palmos/cursor.cpp
@@ -96,7 +96,7 @@ wxCursor::wxCursor(const wxString& filename,
 }
 
 // Cursors by stock number
-wxCursor::wxCursor(int idCursor)
+wxCursor::wxCursor(wxStockCursor idCursor)
 {
 }
 

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index f7e2de3c0c37e88a37428f6ffa15a954c37ba7e1..a58a60d8f5086e2d515a01d2e4de72ae10ee51c0 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -677,7 +677,7 @@ void Window::SetFont(Font &font) {
 }
 
 void Window::SetCursor(Cursor curs) {
-    int cursorId;
+    wxStockCursor cursorId;
 
     switch (curs) {
     case cursorText:
@@ -708,16 +708,13 @@ void Window::SetCursor(Cursor curs) {
         cursorId = wxCURSOR_ARROW;
         break;
     }
-#ifdef __WXMOTIF__
-       wxCursor wc = wxStockCursor(cursorId) ;
-#else
-       wxCursor wc = wxCursor(cursorId) ;
-#endif
-       if(curs != cursorLast)
-       {
-           GETWIN(id)->SetCursor(wc);
-           cursorLast = curs;
-       }
+
+    wxCursor wc = wxCursor(cursorId);
+    if(curs != cursorLast)
+    {
+        GETWIN(id)->SetCursor(wc);
+        cursorLast = curs;
+    }
 }
 
 

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index f1b2a9dc894fa3bbc79dbce76007d6443b384924..2650afcfab21cc7b73422eca4aa63e21743daddc 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -66,7 +66,7 @@ wxCursor::wxCursor()
 
 }
 
-wxCursor::wxCursor( int cursorId )
+wxCursor::wxCursor( wxStockCursor cursorId )
 {
     m_refData = new wxCursorRefData();