← Back to branch summary

~ubuntu-branches/ubuntu/natty/geany/natty

« back to all changes in this revision

Viewing changes to scintilla/LineMarker.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Chow Loong Jin
  • Date: 2010-08-07 03:23:12 UTC
  • mfrom: (1.4.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20100807032312-ot70ac9d50cn79we
Tags: upstream-0.19
Import upstream version 0.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
scintilla/LineMarker.cxx
31
31
        markType = SC_MARK_PIXMAP;
32
32
}
33
33
 
34
 
void LineMarker::SetXPM(const char * const *linesForm) {
 
34
void LineMarker::SetXPM(const char *const *linesForm) {
35
35
        delete pxpm;
36
36
        pxpm = new XPM(linesForm);
37
37
        markType = SC_MARK_PIXMAP;
154
154
                rcSmall.bottom = rc.bottom - 2;
155
155
                surface->RectangleDraw(rcSmall, fore.allocated, back.allocated);
156
156
 
157
 
        } else if (markType == SC_MARK_EMPTY || markType == SC_MARK_BACKGROUND || 
 
157
        } else if (markType == SC_MARK_EMPTY || markType == SC_MARK_BACKGROUND ||
158
158
                markType == SC_MARK_UNDERLINE || markType == SC_MARK_AVAILABLE) {
159
159
                // An invisible marker so don't draw anything
160
160