diff options
| author | nyamatongwe <unknown> | 2003-03-09 04:08:13 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2003-03-09 04:08:13 +0000 |
| commit | 0e5e6b976c968dce6e63eb68ecaabab35398ed24 (patch) | |
| tree | b11df1d33c65b821e0eabb3c84a5503cefae7534 /gtk/ScintillaGTK.cxx | |
| parent | fc4ce601c44f0bc0ac7529d76597e482be9b97e4 (diff) | |
| download | scintilla-mirror-0e5e6b976c968dce6e63eb68ecaabab35398ed24.tar.gz | |
Added Pango text display support to GTK+ platform.
Added WindowID parameter to all Surface initialisation methods as Pango
requires a window to determine the context used for text functions.
AutoSurface changed because of above to take an Editor* argument so it
can then discover the code page and window.
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 7a2bfa458..e0fd95a99 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -93,7 +93,7 @@ class ScintillaGTK : public ScintillaBase { gint wheelMouseIntensity; // Private so ScintillaGTK objects can not be copied -ScintillaGTK(const ScintillaGTK &) : ScintillaBase() {} + ScintillaGTK(const ScintillaGTK &) : ScintillaBase() {} ScintillaGTK &operator=(const ScintillaGTK &) { return * this; } public: @@ -654,7 +654,7 @@ void ScintillaGTK::FullPaint() { if ((PWidget(wMain))->window) { Surface *sw = Surface::Allocate(); if (sw) { - sw->Init((PWidget(wMain))->window); + sw->Init(PWidget(wMain)->window, PWidget(wMain)); Paint(sw, rcPaint); sw->Release(); delete sw; @@ -691,7 +691,7 @@ void ScintillaGTK::SyncPaint(PRectangle rc) { if ((PWidget(wMain))->window) { Surface *sw = Surface::Allocate(); if (sw) { - sw->Init((PWidget(wMain))->window); + sw->Init(PWidget(wMain)->window, PWidget(wMain)); Paint(sw, rc); sw->Release(); delete sw; @@ -1520,7 +1520,7 @@ gint ScintillaGTK::Expose(GtkWidget *, GdkEventExpose *ose) { paintingAllText = rcPaint.Contains(rcClient); Surface *surfaceWindow = Surface::Allocate(); if (surfaceWindow) { - surfaceWindow->Init((PWidget(wMain))->window); + surfaceWindow->Init(PWidget(wMain)->window, PWidget(wMain)); // Fill the corner between the scrollbars PRectangle rcCorner = wMain.GetClientPosition(); if (verticalScrollBarVisible) @@ -1668,7 +1668,7 @@ void ScintillaGTK::PopUpCB(ScintillaGTK *sciThis, guint action, GtkWidget *) { gint ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, CallTip *ctip) { Surface *surfaceWindow = Surface::Allocate(); if (surfaceWindow) { - surfaceWindow->Init(widget->window); + surfaceWindow->Init(widget->window, widget); ctip->PaintCT(surfaceWindow); surfaceWindow->Release(); delete surfaceWindow; |