#include "wx/imaglist.h"
#include "wx/tokenzr.h"
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
ColourAllocated fill, int alphaFill,
ColourAllocated outline, int alphaOutline,
int /*flags*/) {
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
// TODO: do something with cornerSize
wxUnusedVar(cornerSize);
}
void Window::SetCursor(Cursor curs) {
- int cursorId;
+ wxStockCursor cursorId;
switch (curs) {
case cursorText:
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;
+ }
}
void *lParam) {
wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;
- return stc->SendMsg(msg, wParam, (long)lParam);
+ return stc->SendMsg(msg, wParam, (wxIntPtr)lParam);
}