* Some WXWIN_COMPATIBILITY_2_4 changes, as well as flagging other
things that will need fixing when WXWIN_COMPATIBILITY_2_4 is turned off. * Create a custom version of the "default" ctor for wxCursor on wxGTK * Switch to new format string and name string constants for default values * Changes some public data members of event classes into properties as they are no longer public in the C++. * Added wxSL_INVERSE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -70,17 +70,17 @@ public:
|
||||
%extend {
|
||||
DocStr(wxCursor,
|
||||
"Construct a Cursor from a file. Specify the type of file using
|
||||
wx.BITAMP_TYPE* constants, and specify the hotspot if not using a cur
|
||||
file.
|
||||
|
||||
This constructor is not available on wxGTK, use ``wx.StockCursor``,
|
||||
``wx.CursorFromImage``, or ``wx.CursorFromBits`` instead.", "");
|
||||
wxCursor(const wxString* cursorName, long type, int hotSpotX=0, int hotSpotY=0) {
|
||||
wx.BITAMP_TYPE* constants, and specify the hotspot if not using a .cur
|
||||
file.","
|
||||
:see: Alternate constructors `wx.StockCursor`,`wx.CursorFromImage`, `wx.CursorFromBits`");
|
||||
wxCursor(const wxString& cursorName, long type, int hotSpotX=0, int hotSpotY=0) {
|
||||
%#ifdef __WXGTK__
|
||||
wxCHECK_MSG(false, NULL,
|
||||
wxT("wx.Cursor constructor not implemented for wxGTK, use wx.StockCursor, wx.CursorFromImage, or wx.CursorFromBits instead."));
|
||||
wxImage img(cursorName, type);
|
||||
img.SetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX);
|
||||
img.SetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY);
|
||||
return new wxCursor(img);
|
||||
%#else
|
||||
return new wxCursor(*cursorName, type, hotSpotX, hotSpotY);
|
||||
return new wxCursor(cursorName, type, hotSpotX, hotSpotY);
|
||||
%#endif
|
||||
}
|
||||
}
|
||||
@@ -90,7 +90,7 @@ This constructor is not available on wxGTK, use ``wx.StockCursor``,
|
||||
DocCtorStrName(
|
||||
wxCursor(int id),
|
||||
"Create a cursor using one of the stock cursors. Note that not all
|
||||
cursors are available on all platforms.", "",
|
||||
stock cursors are available on all platforms.", "",
|
||||
StockCursor);
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user