ports/editors/fxite/files/patch-fxscintilla_ScintillaFOX.cxx
Jason E. Hale 60f61d1988 Fix build with clang 6 (C++11 requires a space between literal and identifier)
Mark FOX17 option broken (Not related to clang 6 in particular, the FOX-1.7
API is ever changing due to being a development version. This project
appears to be dead, so I'm not sure it is worth fixing.)
recorder.cpp:104:9: error: no matching member function for call to 'prepend'
        NewMessage();
        ^~~~~~~~~~~~
recorder.cpp:51:6: note: expanded from macro 'NewMessage'
list.prepend((FXObject*)mm);
~~~~~^~~~~~~
/usr/local/include/fox-1.7/FXObjectList.h:256:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'MacroMessage *' for 1st argument
  FXbool prepend(TYPE* object){ return FXObjectList::prepend(object); }
         ^
/usr/local/include/fox-1.7/FXObjectList.h:265:10: note: candidate function not viable: no known conversion from 'FX::FXObject *' to 'const FXObjectListOf<MacroMessage>' for 1st argument
  FXbool prepend(const FXObjectListOf<TYPE>& objects){ return FXObjectList::prepend(objects); }
         ^
/usr/local/include/fox-1.7/FXObjectList.h:259:10: note: candidate function not viable: requires 2 arguments, but 1 was provided
  FXbool prepend(TYPE* object,FXival n){ return FXObjectList::prepend(object,n); }
         ^
/usr/local/include/fox-1.7/FXObjectList.h:262:10: note: candidate function not viable: requires 2 arguments, but 1 was provided
  FXbool prepend(TYPE** objects,FXival n){ return FXObjectList::prepend(objects,n); }
         ^

Rename/remake patches
2018-02-16 08:12:16 +00:00

29 lines
1.1 KiB
C++

--- fxscintilla/ScintillaFOX.cxx.orig 2013-10-03 09:22:51 UTC
+++ fxscintilla/ScintillaFOX.cxx
@@ -171,7 +171,7 @@ class ScintillaFOX : public ScintillaBase { (private)
// From ScintillaBase
virtual bool ModifyScrollBars(int nMax, int nPage);
virtual void ReconfigureScrollBars();
- virtual PRectangle GetClientRectangle();
+ virtual PRectangle GetClientRectangle() const;
virtual int KeyDefault(int key, int modifiers);
// Popup flag
@@ -662,7 +662,7 @@ sptr_t ScintillaFOX::DirectFunction(
return sciThis->WndProc(iMessage, wParam, lParam);
}
-PRectangle ScintillaFOX::GetClientRectangle() {
+PRectangle ScintillaFOX::GetClientRectangle() const {
// Have to call FXScrollArea::getViewportXxxx instead of getViewportXxxx
// to prevent infinite loop
#ifdef FOX_1_6
@@ -1256,7 +1256,7 @@ long FXScintilla::onDNDMotion(FXObject* sender,FXSelec
FXDragAction action;
FXint pos;
// Scroll into view
- if(startAutoScroll(ev, TRUE)) return 1;
+ if(startAutoScroll(ev, true)) return 1;
// Handled elsewhere
if(FXScrollArea::onDNDMotion(sender,sel,ptr)) return 1;