pull/1/head
Timothy Pearson 13 years ago
parent 5b3b788b37
commit 2ca85d3360

@ -4,7 +4,7 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = qscintillaplugin TARGET = qscintillaplugin
# DESTDIR = $(QTDIR)/plugins/designer # DESTDIR = $(QTDIR)/plugins/designer
INCLUDEPATH = ../qt INCLUDEPATH = ../qt /usr/include/tqt
LIBPATH += ../tmplib LIBPATH += ../tmplib
CONFIG += qt warn_on release plugin CONFIG += qt warn_on release plugin

@ -1,9 +1,9 @@
// This implements the TQScintilla plugin for TQt Designer. // This implements the TQScintilla plugin for TQt Designer.
#include <tqwidgetplugin.h> #include <qwidgetplugin.h>
#include "../tqt/qextscintilla.h" #include "../qt/qextscintilla.h"
static const char *qscintilla_pixmap[]={ static const char *qscintilla_pixmap[]={

@ -30,7 +30,7 @@
#include <tqpainter.h> #include <tqpainter.h>
#include "qextscintillabase.h" #include "qextscintillabase.h"
#include "ScintillaTQt.h" #include "ScintillaQt.h"
// We want to use the Scintilla notification names as TQt signal names. // We want to use the Scintilla notification names as TQt signal names.

@ -31,7 +31,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include "qextscintillabase.h" #include "qextscintillabase.h"
#include "ScintillaTQt.h" #include "ScintillaQt.h"
// The #defines in Scintilla.h and the enums in qextscintillabase.h conflict // The #defines in Scintilla.h and the enums in qextscintillabase.h conflict
@ -80,11 +80,11 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
txtarea -> setFocusProxy(this); txtarea -> setFocusProxy(this);
tqlayout -> addWidget(txtarea,0,0); tqlayout -> addWidget(txtarea,0,0);
vsb = new TQScrollBarQt::Vertical,this); vsb = new TQScrollBar(Qt::Vertical,this);
tqlayout -> addWidget(vsb,0,1); tqlayout -> addWidget(vsb,0,1);
connect(vsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleVSb(int))); connect(vsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleVSb(int)));
hsb = new TQScrollBarQt::Horizontal,this); hsb = new TQScrollBar(Qt::Horizontal,this);
tqlayout -> addWidget(hsb,1,0); tqlayout -> addWidget(hsb,1,0);
connect(hsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleHSb(int))); connect(hsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleHSb(int)));
@ -386,9 +386,9 @@ void QextScintillaBase::mouseWheel(TQWheelEvent *we)
{ {
setFocus(); setFocus();
if (we -> orientation() ==Qt::Horizontal || we -> state() & ShiftButton) if (we -> orientation() == Qt::Horizontal || we -> state() & ShiftButton)
TQApplication::sendEvent(hsb,we); TQApplication::sendEvent(hsb,we);
else if (we -> orientation() ==Qt::Vertical) else if (we -> orientation() == Qt::Vertical)
TQApplication::sendEvent(vsb,we); TQApplication::sendEvent(vsb,we);
} }
@ -558,7 +558,7 @@ void QextScintillaBase::handleVSb(int val)
// Handle the horizontal scrollbar. // Handle the horizontal scrollbar.
void QextScintillaBase::handleHSb(int val) void QextScintillaBase::handleHSb(int val)
{ {
sci ->Qt::HorizontalScrollTo(val); sci ->HorizontalScrollTo(val);
} }

@ -368,7 +368,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void ScrollTo(int line, bool moveThumb=true); void ScrollTo(int line, bool moveThumb=true);
virtual void ScrollText(int linesToMove); virtual void ScrollText(int linesToMove);
voidQt::HorizontalScrollTo(int xPos); void HorizontalScrollTo(int xPos);
void MoveCaretInsideView(bool ensureVisible=true); void MoveCaretInsideView(bool ensureVisible=true);
int DisplayFromPosition(int pos); int DisplayFromPosition(int pos);
void EnsureCaretVisible(bool useMargin=true, bool vert=true, bool horiz=true); void EnsureCaretVisible(bool useMargin=true, bool vert=true, bool horiz=true);

Loading…
Cancel
Save