~ubuntu-branches/ubuntu/wily/tora/wily-proposed

« back to all changes in this revision

Viewing changes to src/qscintilla2/src/LineMarker.h

Committer: Bazaar Package Importer
Author(s): Michael Meskes
Date: 2009-11-19 15:18:19 UTC
mfrom: (1.2.9 upstream) (3.3.3 squeeze)
Revision ID: james.westby@ubuntu.com-20091119151819-me89ezmxzkvl0lws

Tags: 2.1.1-1

New upstream version.

files added:
osx_tools

osx_tools/CompleteBundle.cmake.in

osx_tools/CreateBundle.sh.in

osx_tools/Info.plist.in

osx_tools/dmg

osx_tools/dmg/background-page001.png

osx_tools/dmg/background.sla

osx_tools/dmg/readme.html

osx_tools/dmg/tora.dmgCanvas

osx_tools/qt.conf.in

src/qscintilla2

src/qscintilla2/CMakeLists.txt

src/qscintilla2/ChangeLog

src/qscintilla2/Qt4

src/qscintilla2/Qt4/ListBoxQt.cpp

src/qscintilla2/Qt4/ListBoxQt.h

src/qscintilla2/Qt4/PlatQt.cpp

src/qscintilla2/Qt4/Qsci

src/qscintilla2/Qt4/Qsci/qsciabstractapis.h

src/qscintilla2/Qt4/Qsci/qsciapis.h

src/qscintilla2/Qt4/Qsci/qscicommand.h

src/qscintilla2/Qt4/Qsci/qscicommandset.h

src/qscintilla2/Qt4/Qsci/qscidocument.h

src/qscintilla2/Qt4/Qsci/qsciglobal.h

src/qscintilla2/Qt4/Qsci/qscilexer.h

src/qscintilla2/Qt4/Qsci/qscilexerbash.h

src/qscintilla2/Qt4/Qsci/qscilexerbatch.h

src/qscintilla2/Qt4/Qsci/qscilexercmake.h

src/qscintilla2/Qt4/Qsci/qscilexercpp.h

src/qscintilla2/Qt4/Qsci/qscilexercsharp.h

src/qscintilla2/Qt4/Qsci/qscilexercss.h

src/qscintilla2/Qt4/Qsci/qscilexerd.h

src/qscintilla2/Qt4/Qsci/qscilexerdiff.h

src/qscintilla2/Qt4/Qsci/qscilexerfortran.h

src/qscintilla2/Qt4/Qsci/qscilexerfortran77.h

src/qscintilla2/Qt4/Qsci/qscilexerhtml.h

src/qscintilla2/Qt4/Qsci/qscilexeridl.h

src/qscintilla2/Qt4/Qsci/qscilexerjava.h

src/qscintilla2/Qt4/Qsci/qscilexerjavascript.h

src/qscintilla2/Qt4/Qsci/qscilexerlua.h

src/qscintilla2/Qt4/Qsci/qscilexermakefile.h

src/qscintilla2/Qt4/Qsci/qscilexerpascal.h

src/qscintilla2/Qt4/Qsci/qscilexerperl.h

src/qscintilla2/Qt4/Qsci/qscilexerpostscript.h

src/qscintilla2/Qt4/Qsci/qscilexerpov.h

src/qscintilla2/Qt4/Qsci/qscilexerproperties.h

src/qscintilla2/Qt4/Qsci/qscilexerpython.h

src/qscintilla2/Qt4/Qsci/qscilexerruby.h

src/qscintilla2/Qt4/Qsci/qscilexersql.h

src/qscintilla2/Qt4/Qsci/qscilexertcl.h

src/qscintilla2/Qt4/Qsci/qscilexertex.h

src/qscintilla2/Qt4/Qsci/qscilexervhdl.h

src/qscintilla2/Qt4/Qsci/qscilexerxml.h

src/qscintilla2/Qt4/Qsci/qscilexeryaml.h

src/qscintilla2/Qt4/Qsci/qscimacro.h

src/qscintilla2/Qt4/Qsci/qsciprinter.h

src/qscintilla2/Qt4/Qsci/qsciscintilla.h

src/qscintilla2/Qt4/Qsci/qsciscintillabase.h

src/qscintilla2/Qt4/SciClasses.cpp

src/qscintilla2/Qt4/SciClasses.h

src/qscintilla2/Qt4/ScintillaQt.cpp

src/qscintilla2/Qt4/ScintillaQt.h

src/qscintilla2/Qt4/qsciabstractapis.cpp

src/qscintilla2/Qt4/qsciapis.cpp

src/qscintilla2/Qt4/qscicommand.cpp

src/qscintilla2/Qt4/qscicommandset.cpp

src/qscintilla2/Qt4/qscidocument.cpp

src/qscintilla2/Qt4/qscilexer.cpp

src/qscintilla2/Qt4/qscilexerbash.cpp

src/qscintilla2/Qt4/qscilexerbatch.cpp

src/qscintilla2/Qt4/qscilexercmake.cpp

src/qscintilla2/Qt4/qscilexercpp.cpp

src/qscintilla2/Qt4/qscilexercsharp.cpp

src/qscintilla2/Qt4/qscilexercss.cpp

src/qscintilla2/Qt4/qscilexerd.cpp

src/qscintilla2/Qt4/qscilexerdiff.cpp

src/qscintilla2/Qt4/qscilexerfortran.cpp

src/qscintilla2/Qt4/qscilexerfortran77.cpp

src/qscintilla2/Qt4/qscilexerhtml.cpp

src/qscintilla2/Qt4/qscilexeridl.cpp

src/qscintilla2/Qt4/qscilexerjava.cpp

src/qscintilla2/Qt4/qscilexerjavascript.cpp

src/qscintilla2/Qt4/qscilexerlua.cpp

src/qscintilla2/Qt4/qscilexermakefile.cpp

src/qscintilla2/Qt4/qscilexerpascal.cpp

src/qscintilla2/Qt4/qscilexerperl.cpp

src/qscintilla2/Qt4/qscilexerpostscript.cpp

src/qscintilla2/Qt4/qscilexerpov.cpp

src/qscintilla2/Qt4/qscilexerproperties.cpp

src/qscintilla2/Qt4/qscilexerpython.cpp

src/qscintilla2/Qt4/qscilexerruby.cpp

src/qscintilla2/Qt4/qscilexersql.cpp

src/qscintilla2/Qt4/qscilexertcl.cpp

src/qscintilla2/Qt4/qscilexertex.cpp

src/qscintilla2/Qt4/qscilexervhdl.cpp

src/qscintilla2/Qt4/qscilexerxml.cpp

src/qscintilla2/Qt4/qscilexeryaml.cpp

src/qscintilla2/Qt4/qscimacro.cpp

src/qscintilla2/Qt4/qsciprinter.cpp

src/qscintilla2/Qt4/qsciscintilla.cpp

src/qscintilla2/Qt4/qsciscintillabase.cpp

src/qscintilla2/include

src/qscintilla2/include/Accessor.h

src/qscintilla2/include/Face.py

src/qscintilla2/include/HFacer.py

src/qscintilla2/include/KeyWords.h

src/qscintilla2/include/License.txt

src/qscintilla2/include/Platform.h

src/qscintilla2/include/PropSet.h

src/qscintilla2/include/SString.h

src/qscintilla2/include/SciLexer.h

src/qscintilla2/include/Scintilla.h

src/qscintilla2/include/Scintilla.iface

src/qscintilla2/include/ScintillaWidget.h

src/qscintilla2/include/WindowAccessor.h

src/qscintilla2/src

src/qscintilla2/src/AutoComplete.cpp

src/qscintilla2/src/AutoComplete.h

src/qscintilla2/src/CallTip.cpp

src/qscintilla2/src/CallTip.h

src/qscintilla2/src/CellBuffer.cpp

src/qscintilla2/src/CellBuffer.h

src/qscintilla2/src/CharClassify.cpp

src/qscintilla2/src/CharClassify.h

src/qscintilla2/src/CharacterSet.h

src/qscintilla2/src/ContractionState.cpp

src/qscintilla2/src/ContractionState.h

src/qscintilla2/src/Decoration.cpp

src/qscintilla2/src/Decoration.h

src/qscintilla2/src/Document.cpp

src/qscintilla2/src/Document.h

src/qscintilla2/src/DocumentAccessor.cpp

src/qscintilla2/src/DocumentAccessor.h

src/qscintilla2/src/Editor.cpp

src/qscintilla2/src/Editor.h

src/qscintilla2/src/ExternalLexer.cpp

src/qscintilla2/src/ExternalLexer.h

src/qscintilla2/src/Indicator.cpp

src/qscintilla2/src/Indicator.h

src/qscintilla2/src/KeyMap.cpp

src/qscintilla2/src/KeyMap.h

src/qscintilla2/src/KeyWords.cpp

src/qscintilla2/src/LexAPDL.cpp

src/qscintilla2/src/LexASY.cpp

src/qscintilla2/src/LexAU3.cpp

src/qscintilla2/src/LexAVE.cpp

src/qscintilla2/src/LexAbaqus.cpp

src/qscintilla2/src/LexAda.cpp

src/qscintilla2/src/LexAsm.cpp

src/qscintilla2/src/LexAsn1.cpp

src/qscintilla2/src/LexBaan.cpp

src/qscintilla2/src/LexBash.cpp

src/qscintilla2/src/LexBasic.cpp

src/qscintilla2/src/LexBullant.cpp

src/qscintilla2/src/LexCLW.cpp

src/qscintilla2/src/LexCPP.cpp

src/qscintilla2/src/LexCSS.cpp

src/qscintilla2/src/LexCaml.cpp

src/qscintilla2/src/LexCmake.cpp

src/qscintilla2/src/LexConf.cpp

src/qscintilla2/src/LexCrontab.cpp

src/qscintilla2/src/LexCsound.cpp

src/qscintilla2/src/LexD.cpp

src/qscintilla2/src/LexEScript.cpp

src/qscintilla2/src/LexEiffel.cpp

src/qscintilla2/src/LexErlang.cpp

src/qscintilla2/src/LexFlagship.cpp

src/qscintilla2/src/LexForth.cpp

src/qscintilla2/src/LexFortran.cpp

src/qscintilla2/src/LexGAP.cpp

src/qscintilla2/src/LexGen.py

src/qscintilla2/src/LexGui4Cli.cpp

src/qscintilla2/src/LexHTML.cpp

src/qscintilla2/src/LexHaskell.cpp

src/qscintilla2/src/LexInno.cpp

src/qscintilla2/src/LexKix.cpp

src/qscintilla2/src/LexLisp.cpp

src/qscintilla2/src/LexLout.cpp

src/qscintilla2/src/LexLua.cpp

src/qscintilla2/src/LexMMIXAL.cpp

src/qscintilla2/src/LexMPT.cpp

src/qscintilla2/src/LexMSSQL.cpp

src/qscintilla2/src/LexMagik.cpp

src/qscintilla2/src/LexMatlab.cpp

src/qscintilla2/src/LexMetapost.cpp

src/qscintilla2/src/LexMySQL.cpp

src/qscintilla2/src/LexNsis.cpp

src/qscintilla2/src/LexOpal.cpp

src/qscintilla2/src/LexOthers.cpp

src/qscintilla2/src/LexPB.cpp

src/qscintilla2/src/LexPLM.cpp

src/qscintilla2/src/LexPOV.cpp

src/qscintilla2/src/LexPS.cpp

src/qscintilla2/src/LexPascal.cpp

src/qscintilla2/src/LexPerl.cpp

src/qscintilla2/src/LexPowerShell.cpp

src/qscintilla2/src/LexProgress.cpp

src/qscintilla2/src/LexPython.cpp

src/qscintilla2/src/LexR.cpp

src/qscintilla2/src/LexRebol.cpp

src/qscintilla2/src/LexRuby.cpp

src/qscintilla2/src/LexSQL.cpp

src/qscintilla2/src/LexScriptol.cpp

src/qscintilla2/src/LexSmalltalk.cpp

src/qscintilla2/src/LexSpecman.cpp

src/qscintilla2/src/LexSpice.cpp

src/qscintilla2/src/LexTADS3.cpp

src/qscintilla2/src/LexTCL.cpp

src/qscintilla2/src/LexTeX.cpp

src/qscintilla2/src/LexVB.cpp

src/qscintilla2/src/LexVHDL.cpp

src/qscintilla2/src/LexVerilog.cpp

src/qscintilla2/src/LexYAML.cpp

src/qscintilla2/src/License.txt

src/qscintilla2/src/LineMarker.cpp

src/qscintilla2/src/LineMarker.h

src/qscintilla2/src/Partitioning.h

src/qscintilla2/src/PositionCache.cpp

src/qscintilla2/src/PositionCache.h

src/qscintilla2/src/PropSet.cpp

src/qscintilla2/src/RESearch.cpp

src/qscintilla2/src/RESearch.h

src/qscintilla2/src/RunStyles.cpp

src/qscintilla2/src/RunStyles.h

src/qscintilla2/src/SVector.h

src/qscintilla2/src/SciTE.properties

src/qscintilla2/src/ScintillaBase.cpp

src/qscintilla2/src/ScintillaBase.h

src/qscintilla2/src/SplitVector.h

src/qscintilla2/src/Style.cpp

src/qscintilla2/src/Style.h

src/qscintilla2/src/StyleContext.cpp

src/qscintilla2/src/StyleContext.h

src/qscintilla2/src/UniConversion.cpp

src/qscintilla2/src/UniConversion.h

src/qscintilla2/src/ViewStyle.cpp

src/qscintilla2/src/ViewStyle.h

src/qscintilla2/src/WindowAccessor.cpp

src/qscintilla2/src/XPM.cpp

src/qscintilla2/src/XPM.h

src/tora.rc

src/windows/dummyoci

src/windows/dummyoci/Makefile

src/windows/dummyoci/oci_nonstub.c

src/windows/dummyoci/oci_stub.c

files modified:
CMakeLists.txt

Makefile.am

Makefile.in

README.BINARIES

README.CMAKE

README.OSX

README.RELEASE

README.WINDOWS

cmake/modules/FindOracle.cmake

configure

configure.ac

debian/changelog

debian/patches/03_README.LAYOUT.dpatch *

doc/help/Makefile

rpm/tora.spec

rpm/tora.spec.in

src/CMakeLists.txt

src/Makefile.am

src/Makefile.in

src/toalert.h

src/todebugtext.h

src/tomain.cpp

src/tomain.h

src/toqsqlconnection.cpp

src/toresultplan.cpp

src/toresultview.h

src/torollback.cpp

src/torollback.h

src/tosqledit.cpp

src/tosyntaxsetup.cpp

src/totemporary.h

src/towaitevents.cpp

src/toworksheet.cpp

src/utils.cpp

Show diffs side-by-side

added added

removed removed

src/qscintilla2/src/LineMarker.h

// Scintilla source code edit control

/** @file LineMarker.h

** Defines the look of a line marker in the margin .

**/

// The License.txt file describes the conditions under which this software may be distributed.

#ifndef LINEMARKER_H

#define LINEMARKER_H

#ifdef SCI_NAMESPACE

namespace Scintilla {

#endif

/**

class LineMarker {

public:

int markType;

ColourPair fore;

ColourPair back;

int alpha;

XPM *pxpm;

LineMarker() {

markType = SC_MARK_CIRCLE;

fore = ColourDesired(0,0,0);

back = ColourDesired(0xff,0xff,0xff);

alpha = SC_ALPHA_NOALPHA;

pxpm = NULL;

}

LineMarker(const LineMarker &) {

// Defined to avoid pxpm being blindly copied, not as real copy constructor

markType = SC_MARK_CIRCLE;

fore = ColourDesired(0,0,0);

back = ColourDesired(0xff,0xff,0xff);

alpha = SC_ALPHA_NOALPHA;

pxpm = NULL;

}

~LineMarker() {

delete pxpm;

}

LineMarker &operator=(const LineMarker &) {

// Defined to avoid pxpm being blindly copied, not as real assignment operator

markType = SC_MARK_CIRCLE;

fore = ColourDesired(0,0,0);

back = ColourDesired(0xff,0xff,0xff);

alpha = SC_ALPHA_NOALPHA;

delete pxpm;

pxpm = NULL;

return *this;

}

void RefreshColourPalette(Palette &pal, bool want);

void SetXPM(const char *textForm);

void SetXPM(const char * const *linesForm);

void Draw(Surface *surface, PRectangle &rc, Font &fontForCharacter);

};

#ifdef SCI_NAMESPACE

}

#endif

Older »