// Scintilla source code edit control
-// PlatWX.cxx - implementation of platform facilities on wxWindows
+// PlatWX.cxx - implementation of platform facilities on wxWidgets
// Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
// Robin Dunn <robin@aldunn.com>
// The License.txt file describes the conditions under which this software may be distributed.
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_STC
+
+#ifndef WX_PRECOMP
+ #include "wx/menu.h"
+ #include "wx/dcmemory.h"
+ #include "wx/settings.h"
+#endif // WX_PRECOMP
+
#include <ctype.h>
-#include <wx/wx.h>
-#include <wx/encconv.h>
-#include <wx/listctrl.h>
-#include <wx/mstream.h>
-#include <wx/image.h>
-#include <wx/imaglist.h>
+#if wxUSE_DISPLAY
+#include "wx/display.h"
+#endif
+
+#include "wx/encconv.h"
+#include "wx/listctrl.h"
+#include "wx/mstream.h"
+#include "wx/image.h"
+#include "wx/imaglist.h"
+#include "wx/tokenzr.h"
+
+#ifdef wxHAS_RAW_BITMAP
+#include "wx/rawbmp.h"
+#endif
+#if wxUSE_GRAPHICS_CONTEXT
+#include "wx/dcgraph.h"
+#endif
#include "Platform.h"
#include "PlatWX.h"
#include "wx/stc/stc.h"
-
-
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
+#include "wx/stc/private.h"
Point Point::FromLong(long lpoint) {
}
wxRect wxRectFromPRectangle(PRectangle prc) {
- wxRect rc(prc.left, prc.top,
- prc.right-prc.left, prc.bottom-prc.top);
- return rc;
+ wxRect r(prc.left, prc.top,
+ prc.Width(), prc.Height());
+ return r;
}
PRectangle PRectangleFromwxRect(wxRect rc) {
rc.GetRight()+1, rc.GetBottom()+1);
}
-wxColour wxColourFromCA(const ColourAllocated& ca) {
- ColourDesired cd(ca.AsLong());
- return wxColour(cd.GetRed(), cd.GetGreen(), cd.GetBlue());
+wxColour wxColourFromCD(ColourDesired& cd) {
+ return wxColour((unsigned char)cd.GetRed(),
+ (unsigned char)cd.GetGreen(),
+ (unsigned char)cd.GetBlue());
}
-//----------------------------------------------------------------------
-
-Palette::Palette() {
- used = 0;
- allowRealization = false;
-}
-
-Palette::~Palette() {
- Release();
+wxColour wxColourFromCDandAlpha(ColourDesired& cd, int alpha) {
+ return wxColour((unsigned char)cd.GetRed(),
+ (unsigned char)cd.GetGreen(),
+ (unsigned char)cd.GetBlue(),
+ (unsigned char)alpha);
}
-void Palette::Release() {
- used = 0;
-}
-
-// This method either adds a colour to the list of wanted colours (want==true)
-// or retrieves the allocated colour back to the ColourPair.
-// This is one method to make it easier to keep the code for wanting and retrieving in sync.
-void Palette::WantFind(ColourPair &cp, bool want) {
- if (want) {
- for (int i=0; i < used; i++) {
- if (entries[i].desired == cp.desired)
- return;
- }
-
- if (used < numEntries) {
- entries[used].desired = cp.desired;
- entries[used].allocated.Set(cp.desired.AsLong());
- used++;
- }
- } else {
- for (int i=0; i < used; i++) {
- if (entries[i].desired == cp.desired) {
- cp.allocated = entries[i].allocated;
- return;
- }
- }
- cp.allocated.Set(cp.desired.AsLong());
- }
-}
-
-void Palette::Allocate(Window &) {
- if (allowRealization) {
- }
-}
-
-
//----------------------------------------------------------------------
Font::Font() {
- id = 0;
+ fid = 0;
ascent = 0;
}
Font::~Font() {
}
-void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic) {
- wxFontEncoding encoding;
-
+void Font::Create(const FontParameters &fp) {
Release();
- switch (characterSet) {
- default:
- case wxSTC_CHARSET_ANSI:
- case wxSTC_CHARSET_DEFAULT:
- encoding = wxFONTENCODING_DEFAULT;
- break;
-
- case wxSTC_CHARSET_BALTIC:
- encoding = wxFONTENCODING_ISO8859_13;
- break;
-
- case wxSTC_CHARSET_CHINESEBIG5:
- encoding = wxFONTENCODING_CP950;
- break;
-
- case wxSTC_CHARSET_EASTEUROPE:
- encoding = wxFONTENCODING_ISO8859_2;
- break;
-
- case wxSTC_CHARSET_GB2312:
- encoding = wxFONTENCODING_CP936;
- break;
-
- case wxSTC_CHARSET_GREEK:
- encoding = wxFONTENCODING_ISO8859_7;
- break;
-
- case wxSTC_CHARSET_HANGUL:
- encoding = wxFONTENCODING_CP949;
- break;
-
- case wxSTC_CHARSET_MAC:
- encoding = wxFONTENCODING_DEFAULT;
- break;
-
- case wxSTC_CHARSET_OEM:
- encoding = wxFONTENCODING_DEFAULT;
- break;
-
- case wxSTC_CHARSET_RUSSIAN:
- encoding = wxFONTENCODING_KOI8;
- break;
-
- case wxSTC_CHARSET_SHIFTJIS:
- encoding = wxFONTENCODING_CP932;
- break;
-
- case wxSTC_CHARSET_SYMBOL:
- encoding = wxFONTENCODING_DEFAULT;
- break;
-
- case wxSTC_CHARSET_TURKISH:
- encoding = wxFONTENCODING_ISO8859_9;
- break;
-
- case wxSTC_CHARSET_JOHAB:
- encoding = wxFONTENCODING_DEFAULT;
- break;
-
- case wxSTC_CHARSET_HEBREW:
- encoding = wxFONTENCODING_ISO8859_8;
- break;
-
- case wxSTC_CHARSET_ARABIC:
- encoding = wxFONTENCODING_ISO8859_6;
- break;
-
- case wxSTC_CHARSET_VIETNAMESE:
- encoding = wxFONTENCODING_DEFAULT;
- break;
-
- case wxSTC_CHARSET_THAI:
- encoding = wxFONTENCODING_ISO8859_11;
- break;
- }
+ // The minus one is done because since Scintilla uses SC_CHARSET_DEFAULT
+ // internally and we need to have wxFONENCODING_DEFAULT == SC_SHARSET_DEFAULT
+ // so we adjust the encoding before passing it to Scintilla. See also
+ // wxStyledTextCtrl::StyleSetCharacterSet
+ wxFontEncoding encoding = (wxFontEncoding)(fp.characterSet-1);
wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
if (ea.GetCount())
encoding = ea[0];
- id = new wxFont(size,
- wxDEFAULT,
- italic ? wxITALIC : wxNORMAL,
- bold ? wxBOLD : wxNORMAL,
- false,
- stc2wx(faceName),
- encoding);
+ wxFontWeight weight;
+ if (fp.weight <= 300)
+ weight = wxFONTWEIGHT_LIGHT;
+ else if (fp.weight >= 700)
+ weight = wxFONTWEIGHT_BOLD;
+ else
+ weight = wxFONTWEIGHT_NORMAL;
+
+ wxFont* font = new wxFont(fp.size,
+ wxFONTFAMILY_DEFAULT,
+ fp.italic ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL,
+ weight,
+ false,
+ stc2wx(fp.faceName),
+ encoding);
+ fid = font;
}
void Font::Release() {
- if (id)
- delete (wxFont*)id;
- id = 0;
+ if (fid)
+ delete (wxFont*)fid;
+ fid = 0;
}
//----------------------------------------------------------------------
virtual void Release();
virtual bool Initialised();
- virtual void PenColour(ColourAllocated fore);
+ virtual void PenColour(ColourDesired fore);
virtual int LogPixelsY();
virtual int DeviceHeightFont(int points);
virtual void MoveTo(int x_, int y_);
virtual void LineTo(int x_, int y_);
- virtual void Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back);
- virtual void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back);
- virtual void FillRectangle(PRectangle rc, ColourAllocated back);
+ virtual void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back);
+ virtual void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back);
+ virtual void FillRectangle(PRectangle rc, ColourDesired back);
virtual void FillRectangle(PRectangle rc, Surface &surfacePattern);
- virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
- virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
+ virtual void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back);
+ virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill,
+ ColourDesired outline, int alphaOutline, int flags);
+ virtual void DrawRGBAImage(PRectangle rc, int width, int height,
+ const unsigned char *pixelsImage);
+ virtual void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back);
virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource);
- virtual void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back);
- virtual void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back);
- virtual void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore);
- virtual void MeasureWidths(Font &font_, const char *s, int len, int *positions);
- virtual int WidthText(Font &font_, const char *s, int len);
- virtual int WidthChar(Font &font_, char ch);
- virtual int Ascent(Font &font_);
- virtual int Descent(Font &font_);
- virtual int InternalLeading(Font &font_);
- virtual int ExternalLeading(Font &font_);
- virtual int Height(Font &font_);
- virtual int AverageCharWidth(Font &font_);
-
- virtual int SetPalette(Palette *pal, bool inBackGround);
+ virtual void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back);
+ virtual void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back);
+ virtual void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore);
+ virtual void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions);
+ virtual XYPOSITION WidthText(Font &font_, const char *s, int len);
+ virtual XYPOSITION WidthChar(Font &font_, char ch);
+ virtual XYPOSITION Ascent(Font &font_);
+ virtual XYPOSITION Descent(Font &font_);
+ virtual XYPOSITION InternalLeading(Font &font_);
+ virtual XYPOSITION ExternalLeading(Font &font_);
+ virtual XYPOSITION Height(Font &font_);
+ virtual XYPOSITION AverageCharWidth(Font &font_);
+
virtual void SetClip(PRectangle rc);
virtual void FlushCachedState();
virtual void SetUnicodeMode(bool unicodeMode_);
virtual void SetDBCSMode(int codePage);
- void BrushColour(ColourAllocated back);
+ void BrushColour(ColourDesired back);
void SetFont(Font &font_);
};
hdc = (wxDC*)hdc_;
}
-void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_, WindowID) {
+void SurfaceImpl::InitPixMap(int width, int height, Surface *WXUNUSED(surface_), WindowID winid) {
Release();
hdc = new wxMemoryDC();
hdcOwned = true;
if (width < 1) width = 1;
if (height < 1) height = 1;
- bitmap = new wxBitmap(width, height);
+ bitmap = new wxBitmap();
+ bitmap->CreateScaled(width, height,wxBITMAP_SCREEN_DEPTH,((wxWindow*)winid)->GetContentScaleFactor());
((wxMemoryDC*)hdc)->SelectObject(*bitmap);
}
}
-void SurfaceImpl::PenColour(ColourAllocated fore) {
- hdc->SetPen(wxPen(wxColourFromCA(fore), 1, wxSOLID));
+void SurfaceImpl::PenColour(ColourDesired fore) {
+ hdc->SetPen(wxPen(wxColourFromCD(fore)));
}
-void SurfaceImpl::BrushColour(ColourAllocated back) {
- hdc->SetBrush(wxBrush(wxColourFromCA(back), wxSOLID));
+void SurfaceImpl::BrushColour(ColourDesired back) {
+ hdc->SetBrush(wxBrush(wxColourFromCD(back)));
}
void SurfaceImpl::SetFont(Font &font_) {
y = y_;
}
-void SurfaceImpl::Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back) {
+void SurfaceImpl::Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back) {
PenColour(fore);
BrushColour(back);
- hdc->DrawPolygon(npts, (wxPoint*)pts);
+ wxPoint *p = new wxPoint[npts];
+
+ for (int i=0; i<npts; i++) {
+ p[i].x = pts[i].x;
+ p[i].y = pts[i].y;
+ }
+ hdc->DrawPolygon(npts, p);
+ delete [] p;
}
-void SurfaceImpl::RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
+void SurfaceImpl::RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) {
PenColour(fore);
BrushColour(back);
hdc->DrawRectangle(wxRectFromPRectangle(rc));
}
-void SurfaceImpl::FillRectangle(PRectangle rc, ColourAllocated back) {
+void SurfaceImpl::FillRectangle(PRectangle rc, ColourDesired back) {
BrushColour(back);
hdc->SetPen(*wxTRANSPARENT_PEN);
hdc->DrawRectangle(wxRectFromPRectangle(rc));
if (((SurfaceImpl&)surfacePattern).bitmap)
br = wxBrush(*((SurfaceImpl&)surfacePattern).bitmap);
else // Something is wrong so display in red
- br = wxBrush(*wxRED, wxSOLID);
+ br = wxBrush(*wxRED);
hdc->SetPen(*wxTRANSPARENT_PEN);
hdc->SetBrush(br);
hdc->DrawRectangle(wxRectFromPRectangle(rc));
}
-void SurfaceImpl::RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
+void SurfaceImpl::RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back) {
PenColour(fore);
BrushColour(back);
hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 4);
}
-void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
+#if defined(__WXMSW__) || defined(__WXMAC__)
+#define wxPy_premultiply(p, a) ((p) * (a) / 0xff)
+#else
+#define wxPy_premultiply(p, a) (p)
+#endif
+
+void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
+ ColourDesired fill, int alphaFill,
+ ColourDesired outline, int alphaOutline,
+ int /*flags*/) {
+#if wxUSE_GRAPHICS_CONTEXT
+ wxGCDC dc(*(wxMemoryDC*)hdc);
+ wxColour penColour(wxColourFromCDandAlpha(outline, alphaOutline));
+ wxColour brushColour(wxColourFromCDandAlpha(fill, alphaFill));
+ dc.SetPen(wxPen(penColour));
+ dc.SetBrush(wxBrush(brushColour));
+ dc.DrawRoundedRectangle(wxRectFromPRectangle(rc), cornerSize);
+ return;
+#else
+
+#ifdef wxHAS_RAW_BITMAP
+
+ // TODO: do something with cornerSize
+ wxUnusedVar(cornerSize);
+
+ int x, y;
+ wxRect r = wxRectFromPRectangle(rc);
+ wxBitmap bmp(r.width, r.height, 32);
+
+ // This block is needed to ensure that the changes done to the bitmap via
+ // pixel data object are committed before the bitmap is drawn.
+ {
+ wxAlphaPixelData pixData(bmp);
+
+ // Set the fill pixels
+ ColourDesired cdf(fill.AsLong());
+ int red = cdf.GetRed();
+ int green = cdf.GetGreen();
+ int blue = cdf.GetBlue();
+
+ wxAlphaPixelData::Iterator p(pixData);
+ for (y=0; y<r.height; y++) {
+ p.MoveTo(pixData, 0, y);
+ for (x=0; x<r.width; x++) {
+ p.Red() = wxPy_premultiply(red, alphaFill);
+ p.Green() = wxPy_premultiply(green, alphaFill);
+ p.Blue() = wxPy_premultiply(blue, alphaFill);
+ p.Alpha() = alphaFill;
+ ++p;
+ }
+ }
+
+ // Set the outline pixels
+ ColourDesired cdo(outline.AsLong());
+ red = cdo.GetRed();
+ green = cdo.GetGreen();
+ blue = cdo.GetBlue();
+ for (x=0; x<r.width; x++) {
+ p.MoveTo(pixData, x, 0);
+ p.Red() = wxPy_premultiply(red, alphaOutline);
+ p.Green() = wxPy_premultiply(green, alphaOutline);
+ p.Blue() = wxPy_premultiply(blue, alphaOutline);
+ p.Alpha() = alphaOutline;
+ p.MoveTo(pixData, x, r.height-1);
+ p.Red() = wxPy_premultiply(red, alphaOutline);
+ p.Green() = wxPy_premultiply(green, alphaOutline);
+ p.Blue() = wxPy_premultiply(blue, alphaOutline);
+ p.Alpha() = alphaOutline;
+ }
+
+ for (y=0; y<r.height; y++) {
+ p.MoveTo(pixData, 0, y);
+ p.Red() = wxPy_premultiply(red, alphaOutline);
+ p.Green() = wxPy_premultiply(green, alphaOutline);
+ p.Blue() = wxPy_premultiply(blue, alphaOutline);
+ p.Alpha() = alphaOutline;
+ p.MoveTo(pixData, r.width-1, y);
+ p.Red() = wxPy_premultiply(red, alphaOutline);
+ p.Green() = wxPy_premultiply(green, alphaOutline);
+ p.Blue() = wxPy_premultiply(blue, alphaOutline);
+ p.Alpha() = alphaOutline;
+ }
+ }
+
+ // Draw the bitmap
+ hdc->DrawBitmap(bmp, r.x, r.y, true);
+
+#else
+ wxUnusedVar(cornerSize);
+ wxUnusedVar(alphaFill);
+ wxUnusedVar(alphaOutline);
+ RectangleDraw(rc, outline, fill);
+#endif
+#endif
+}
+
+#ifdef wxHAS_RAW_BITMAP
+wxBitmap BitmapFromRGBAImage(int width, int height, const unsigned char *pixelsImage)
+{
+ int x, y;
+ wxBitmap bmp(width, height, 32);
+ wxAlphaPixelData pixData(bmp);
+
+ wxAlphaPixelData::Iterator p(pixData);
+ for (y=0; y<height; y++) {
+ p.MoveTo(pixData, 0, y);
+ for (x=0; x<width; x++) {
+ unsigned char red = *pixelsImage++;
+ unsigned char green = *pixelsImage++;
+ unsigned char blue = *pixelsImage++;
+ unsigned char alpha = *pixelsImage++;
+
+ p.Red() = wxPy_premultiply(red, alpha);
+ p.Green() = wxPy_premultiply(green, alpha);
+ p.Blue() = wxPy_premultiply(blue, alpha);
+ p.Alpha() = alpha;
+ ++p;
+ }
+ }
+ return bmp;
+}
+#endif
+
+
+void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height,
+ const unsigned char *pixelsImage)
+{
+#ifdef wxHAS_RAW_BITMAP
+ wxRect r = wxRectFromPRectangle(rc);
+ wxBitmap bmp = BitmapFromRGBAImage(width, height, pixelsImage);
+ hdc->DrawBitmap(bmp, r.x, r.y, true);
+#endif
+}
+
+
+void SurfaceImpl::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) {
PenColour(fore);
BrushColour(back);
hdc->DrawEllipse(wxRectFromPRectangle(rc));
from.x, from.y, wxCOPY);
}
-void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase,
+void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, XYPOSITION ybase,
const char *s, int len,
- ColourAllocated fore, ColourAllocated back) {
+ ColourDesired fore, ColourDesired back) {
SetFont(font);
- hdc->SetTextForeground(wxColourFromCA(fore));
- hdc->SetTextBackground(wxColourFromCA(back));
- //FillRectangle(rc, back);
+ hdc->SetTextForeground(wxColourFromCD(fore));
+ hdc->SetTextBackground(wxColourFromCD(back));
+ FillRectangle(rc, back);
// ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
}
-void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
+void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, XYPOSITION ybase,
const char *s, int len,
- ColourAllocated fore, ColourAllocated back) {
+ ColourDesired fore, ColourDesired back) {
SetFont(font);
- hdc->SetTextForeground(wxColourFromCA(fore));
- hdc->SetTextBackground(wxColourFromCA(back));
- //FillRectangle(rc, back);
+ hdc->SetTextForeground(wxColourFromCD(fore));
+ hdc->SetTextBackground(wxColourFromCD(back));
+ FillRectangle(rc, back);
hdc->SetClippingRegion(wxRectFromPRectangle(rc));
// see comments above
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
+ hdc->DestroyClippingRegion();
}
-void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
+void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, XYPOSITION ybase,
const char *s, int len,
- ColourAllocated fore) {
+ ColourDesired fore) {
SetFont(font);
- hdc->SetTextForeground(wxColourFromCA(fore));
- hdc->SetBackgroundMode(wxTRANSPARENT);
+ hdc->SetTextForeground(wxColourFromCD(fore));
+ hdc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
// ybase is where the baseline should be, but wxWin uses the upper left
// corner, so I need to calculate the real position for the text...
hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
- hdc->SetBackgroundMode(wxSOLID);
+ hdc->SetBackgroundMode(wxBRUSHSTYLE_SOLID);
}
-void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) {
+void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, XYPOSITION *positions) {
- wxString str = stc2wx(s, len);
- SetFont(font);
+ wxString str = stc2wx(s, len);
+ wxArrayInt tpos;
-#ifndef __WXMAC__
- // Calculate the position of each character based on the widths of
- // the previous characters
- int* tpos = new int[len];
- int totalWidth = 0;
- size_t i;
- for (i=0; i<str.Length(); i++) {
- int w, h;
- hdc->GetTextExtent(str[i], &w, &h);
- totalWidth += w;
- tpos[i] = totalWidth;
- }
-#else
- // Instead of a running total, remeasure from the begining of the
- // text for each character's position. This is because with AA fonts
- // on OS X widths can be fractions of pixels wide when more than one
- // are drawn together, so the sum of all character widths is not necessarily
- // (and probably not) the same as the whole string width.
- int* tpos = new int[len];
- size_t i;
- for (i=0; i<str.Length(); i++) {
- int w, h;
- hdc->GetTextExtent(str.Left(i+1), &w, &h);
- tpos[i] = w;
- }
-#endif
+ SetFont(font);
+ hdc->GetPartialTextExtents(str, tpos);
#if wxUSE_UNICODE
// Map the widths for UCS-2 characters back to the UTF-8 input string
// NOTE: I don't think this is right for when sizeof(wxChar) > 2, ie wxGTK2
// so figure it out and fix it!
- i = 0;
+ size_t i = 0;
size_t ui = 0;
while ((int)i < len) {
unsigned char uch = (unsigned char)s[i];
#else
// If not unicode then just use the widths we have
- memcpy(positions, tpos, len * sizeof(*tpos));
+#if wxUSE_STD_CONTAINERS
+ std::copy(tpos.begin(), tpos.end(), positions);
+#else
+ memcpy(positions, tpos.begin(), len * sizeof(int));
+#endif
#endif
-
- delete [] tpos;
}
-int SurfaceImpl::WidthText(Font &font, const char *s, int len) {
+XYPOSITION SurfaceImpl::WidthText(Font &font, const char *s, int len) {
SetFont(font);
int w;
int h;
}
-int SurfaceImpl::WidthChar(Font &font, char ch) {
+XYPOSITION SurfaceImpl::WidthChar(Font &font, char ch) {
SetFont(font);
int w;
int h;
#define EXTENT_TEST wxT(" `~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-int SurfaceImpl::Ascent(Font &font) {
+XYPOSITION SurfaceImpl::Ascent(Font &font) {
SetFont(font);
int w, h, d, e;
hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
return font.ascent;
}
-int SurfaceImpl::Descent(Font &font) {
+XYPOSITION SurfaceImpl::Descent(Font &font) {
SetFont(font);
int w, h, d, e;
hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
return d;
}
-int SurfaceImpl::InternalLeading(Font &font) {
+XYPOSITION SurfaceImpl::InternalLeading(Font &WXUNUSED(font)) {
return 0;
}
-int SurfaceImpl::ExternalLeading(Font &font) {
+XYPOSITION SurfaceImpl::ExternalLeading(Font &font) {
SetFont(font);
int w, h, d, e;
hdc->GetTextExtent(EXTENT_TEST, &w, &h, &d, &e);
return e;
}
-int SurfaceImpl::Height(Font &font) {
+XYPOSITION SurfaceImpl::Height(Font &font) {
SetFont(font);
- return hdc->GetCharHeight();
+ return hdc->GetCharHeight() + 1;
}
-int SurfaceImpl::AverageCharWidth(Font &font) {
+XYPOSITION SurfaceImpl::AverageCharWidth(Font &font) {
SetFont(font);
return hdc->GetCharWidth();
}
-int SurfaceImpl::SetPalette(Palette *pal, bool inBackGround) {
- return 0;
-}
-
void SurfaceImpl::SetClip(PRectangle rc) {
hdc->SetClippingRegion(wxRectFromPRectangle(rc));
}
unicodeMode=unicodeMode_;
}
-void SurfaceImpl::SetDBCSMode(int codePage) {
+void SurfaceImpl::SetDBCSMode(int WXUNUSED(codePage)) {
// dbcsMode = codePage == SC_CP_DBCS;
}
-Surface *Surface::Allocate() {
+Surface *Surface::Allocate(int WXUNUSED(technology)) {
return new SurfaceImpl;
}
}
void Window::Destroy() {
- if (id) {
- Show(FALSE);
- GETWIN(id)->Destroy();
+ if (wid) {
+ Show(false);
+ GETWIN(wid)->Destroy();
}
- id = 0;
+ wid = 0;
}
bool Window::HasFocus() {
- return wxWindow::FindFocus() == GETWIN(id);
+ return wxWindow::FindFocus() == GETWIN(wid);
}
PRectangle Window::GetPosition() {
- if (! id) return PRectangle();
- wxRect rc(GETWIN(id)->GetPosition(), GETWIN(id)->GetSize());
+ if (! wid) return PRectangle();
+ wxRect rc(GETWIN(wid)->GetPosition(), GETWIN(wid)->GetSize());
return PRectangleFromwxRect(rc);
}
void Window::SetPosition(PRectangle rc) {
wxRect r = wxRectFromPRectangle(rc);
- GETWIN(id)->SetSize(r);
+ GETWIN(wid)->SetSize(r);
}
void Window::SetPositionRelative(PRectangle rc, Window) {
}
PRectangle Window::GetClientPosition() {
- if (! id) return PRectangle();
- wxSize sz = GETWIN(id)->GetClientSize();
+ if (! wid) return PRectangle();
+ wxSize sz = GETWIN(wid)->GetClientSize();
return PRectangle(0, 0, sz.x, sz.y);
}
void Window::Show(bool show) {
- GETWIN(id)->Show(show);
+ GETWIN(wid)->Show(show);
}
void Window::InvalidateAll() {
- GETWIN(id)->Refresh(false);
- wxWakeUpIdle();
+ GETWIN(wid)->Refresh(false);
}
void Window::InvalidateRectangle(PRectangle rc) {
wxRect r = wxRectFromPRectangle(rc);
- GETWIN(id)->Refresh(false, &r);
- wxWakeUpIdle();
+ GETWIN(wid)->Refresh(false, &r);
}
void Window::SetFont(Font &font) {
- GETWIN(id)->SetFont(*((wxFont*)font.GetID()));
+ GETWIN(wid)->SetFont(*((wxFont*)font.GetID()));
}
void Window::SetCursor(Cursor curs) {
- int cursorId;
+ wxStockCursor cursorId;
switch (curs) {
case cursorText:
break;
case cursorHand:
cursorId = wxCURSOR_HAND;
+ break;
default:
cursorId = wxCURSOR_ARROW;
break;
}
-#ifdef __WXMOTIF__
- wxCursor wc = wxStockCursor(cursorId) ;
-#else
- wxCursor wc = wxCursor(cursorId) ;
-#endif
- GETWIN(id)->SetCursor(wc);
+
+ wxCursor wc = wxCursor(cursorId);
+ if(curs != cursorLast)
+ {
+ GETWIN(wid)->SetCursor(wc);
+ cursorLast = curs;
+ }
}
void Window::SetTitle(const char *s) {
- GETWIN(id)->SetTitle(stc2wx(s));
+ GETWIN(wid)->SetLabel(stc2wx(s));
}
+// Returns rectangle of monitor pt is on
+PRectangle Window::GetMonitorRect(Point pt) {
+ wxRect rect;
+ if (! wid) return PRectangle();
+#if wxUSE_DISPLAY
+ // Get the display the point is found on
+ int n = wxDisplay::GetFromPoint(wxPoint(pt.x, pt.y));
+ wxDisplay dpy(n == wxNOT_FOUND ? 0 : n);
+ rect = dpy.GetGeometry();
+#else
+ wxUnusedVar(pt);
+#endif
+ return PRectangleFromwxRect(rect);
+}
+
//----------------------------------------------------------------------
// Helper classes for ListBox
-// This is a simple subclass of wxLIstView that just resets focus to the
+// This is a simple subclass of wxListView that just resets focus to the
// parent when it gets it.
class wxSTCListBox : public wxListView {
public:
wxSTCListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style)
- : wxListView(parent, id, pos, size, style)
- {}
+ : wxListView()
+ {
+#ifdef __WXMSW__
+ Hide(); // don't flicker as we move it around...
+#endif
+ Create(parent, id, pos, size, style);
+ }
+
void OnFocus(wxFocusEvent& event) {
GetParent()->SetFocus();
event.Skip();
}
+ void OnKillFocus(wxFocusEvent& WXUNUSED(event)) {
+ // Do nothing. Prevents base class from resetting the colors...
+ }
+
+#ifdef __WXMAC__
+ // For some reason I don't understand yet the focus doesn't really leave
+ // the listbox like it should, so if we get any events feed them back to
+ // the wxSTC
+ void OnKeyDown(wxKeyEvent& event) {
+ GetGrandParent()->GetEventHandler()->ProcessEvent(event);
+ }
+ void OnChar(wxKeyEvent& event) {
+ GetGrandParent()->GetEventHandler()->ProcessEvent(event);
+ }
+
+ // And we need to force the focus back when being destroyed
+ ~wxSTCListBox() {
+ GetGrandParent()->SetFocus();
+ }
+#endif
+
private:
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(wxSTCListBox, wxListView)
EVT_SET_FOCUS( wxSTCListBox::OnFocus)
+ EVT_KILL_FOCUS(wxSTCListBox::OnKillFocus)
+#ifdef __WXMAC__
+ EVT_KEY_DOWN( wxSTCListBox::OnKeyDown)
+ EVT_CHAR( wxSTCListBox::OnChar)
+#endif
END_EVENT_TABLE()
+#if wxUSE_POPUPWIN //-----------------------------------
+#include "wx/popupwin.h"
-// A window to place the wxSTCListBox upon
-class wxSTCListBoxWin : public wxWindow {
+// A popup window to place the wxSTCListBox upon
+class wxSTCListBoxWin : public wxPopupWindow
+{
private:
wxListView* lv;
CallBackAction doubleClickAction;
void* doubleClickActionData;
public:
- wxSTCListBoxWin(wxWindow* parent, wxWindowID id) :
- wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxNO_BORDER )
+ wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
+ wxPopupWindow(parent, wxBORDER_SIMPLE)
{
- SetBackgroundColour(*wxBLACK);
- lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
- wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
+ lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,
+ wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxBORDER_NONE);
lv->SetCursor(wxCursor(wxCURSOR_ARROW));
lv->InsertColumn(0, wxEmptyString);
lv->InsertColumn(1, wxEmptyString);
- Hide();
+
+ // NOTE: We need to fool the wxListView into thinking that it has the
+ // focus so it will use the normal selection colour and will look
+ // "right" to the user. But since the wxPopupWindow or its children
+ // can't receive focus then we have to pull a fast one and temporarily
+ // parent the listctrl on the STC window and then call SetFocus and
+ // then reparent it back to the popup.
+ lv->SetFocus();
+ lv->Reparent(this);
+#ifdef __WXMSW__
+ lv->Show();
+#endif
+#if defined(__WXOSX_COCOA__) || defined(__WXGTK__)
+ // This color will end up being our border
+ SetBackgroundColour(wxColour(0xC0, 0xC0, 0xC0));
+#endif
+ }
+
+
+ // Set position in client coords
+ virtual void DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags = wxSIZE_AUTO) {
+ if (x != wxDefaultCoord) {
+ GetParent()->ClientToScreen(&x, NULL);
+ }
+ if (y != wxDefaultCoord) {
+ GetParent()->ClientToScreen(NULL, &y);
+ }
+ wxPopupWindow::DoSetSize(x, y, width, height, sizeFlags);
+ }
+
+ // return position as if it were in client coords
+ virtual void DoGetPosition( int *x, int *y ) const {
+ int sx, sy;
+ wxPopupWindow::DoGetPosition(&sx, &sy);
+ GetParent()->ScreenToClient(&sx, &sy);
+ if (x) *x = sx;
+ if (y) *y = sy;
}
+
+ bool Destroy() {
+ if ( !wxPendingDelete.Member(this) )
+ wxPendingDelete.Append(this);
+ return true;
+ }
+
+
int IconWidth() {
wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
if (il != NULL) {
}
void OnSize(wxSizeEvent& event) {
- // resize the child, leaving a 1 pixel border
+ // resize the child to fill the popup
wxSize sz = GetClientSize();
- lv->SetSize(1, 1, sz.x-2, sz.y-2);
+ int x, y, w, h;
+ x = y = 0;
+ w = sz.x;
+ h = sz.y;
+#if defined(__WXOSX_COCOA__) || defined(__WXGTK__)
+ // make room for the parent's bg color to show, to act as a border
+ x = y = 1;
+ w -= 2;
+ h -= 2;
+#endif
+ lv->SetSize(x, y, w, h);
+ // reset the column widths
+ lv->SetColumnWidth(0, IconWidth()+4);
+ lv->SetColumnWidth(1, w - 2 - lv->GetColumnWidth(0) -
+ wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
+ event.Skip();
+ }
+
+ void OnActivate(wxListEvent& WXUNUSED(event)) {
+ doubleClickAction(doubleClickActionData);
+ }
+
+ wxListView* GetLB() { return lv; }
+
+private:
+ DECLARE_EVENT_TABLE()
+
+};
+
+BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow)
+ EVT_SET_FOCUS ( wxSTCListBoxWin::OnFocus)
+ EVT_SIZE ( wxSTCListBoxWin::OnSize)
+ EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
+END_EVENT_TABLE()
+
+
+
+#else // !wxUSE_POPUPWIN -----------------------------------
+#include "wx/frame.h"
+
+// A normal window to place the wxSTCListBox upon, but make it behave as much
+// like a wxPopupWindow as possible
+class wxSTCListBoxWin : public wxFrame {
+private:
+ wxListView* lv;
+ CallBackAction doubleClickAction;
+ void* doubleClickActionData;
+public:
+ wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point location) :
+ wxFrame(parent, id, wxEmptyString, wxPoint(location.x, location.y), wxSize(0,0),
+ wxFRAME_NO_TASKBAR
+ | wxFRAME_FLOAT_ON_PARENT
+#ifdef __WXMAC__
+ | wxPOPUP_WINDOW
+ | wxNO_BORDER
+#else
+ | wxSIMPLE_BORDER
+#endif
+ )
+ {
+
+ lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
+ wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
+ lv->SetCursor(wxCursor(wxCURSOR_ARROW));
+ lv->InsertColumn(0, wxEmptyString);
+ lv->InsertColumn(1, wxEmptyString);
+
+ // Eventhough we immediately reset the focus to the parent, this helps
+ // things to look right...
+ lv->SetFocus();
+
+ Hide();
+ }
+
+
+ // On OSX and (possibly others) there can still be pending
+ // messages/events for the list control when Scintilla wants to
+ // close it, so do a pending delete of it instead of destroying
+ // immediately.
+ bool Destroy()
+ {
+#ifdef __WXMAC__
+ // The bottom edge of this window is not getting properly
+ // refreshed upon deletion, so help it out...
+ wxWindow* p = GetParent();
+ wxRect r(GetPosition(), GetSize());
+ r.SetHeight(r.GetHeight()+1);
+ p->Refresh(false, &r);
+#endif
+ if ( !wxPendingDelete.Member(this) )
+ wxPendingDelete.Append(this);
+ return true;
+ }
+
+
+ int IconWidth()
+ {
+ wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
+ if (il != NULL) {
+ int w, h;
+ il->GetSize(0, w, h);
+ return w;
+ }
+ return 0;
+ }
+
+
+ void SetDoubleClickAction(CallBackAction action, void *data)
+ {
+ doubleClickAction = action;
+ doubleClickActionData = data;
+ }
+
+
+ void OnFocus(wxFocusEvent& event)
+ {
+ ActivateParent();
+ GetParent()->SetFocus();
+ event.Skip();
+ }
+
+ void OnSize(wxSizeEvent& event)
+ {
+ // resize the child
+ wxSize sz = GetClientSize();
+ lv->SetSize(sz);
// reset the column widths
lv->SetColumnWidth(0, IconWidth()+4);
lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -
event.Skip();
}
- void OnActivate(wxListEvent& event) {
+ void ActivateParent()
+ {
+ // Although we're a frame, we always want the parent to be active, so
+ // raise it whenever we get shown, focused, etc.
+ wxTopLevelWindow *frame = wxDynamicCast(
+ wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
+ if (frame)
+ frame->Raise();
+ }
+
+
+ virtual void DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags = wxSIZE_AUTO)
+ {
+ // convert coords to screen coords since we're a top-level window
+ if (x != wxDefaultCoord) {
+ GetParent()->ClientToScreen(&x, NULL);
+ }
+ if (y != wxDefaultCoord) {
+ GetParent()->ClientToScreen(NULL, &y);
+ }
+ wxFrame::DoSetSize(x, y, width, height, sizeFlags);
+ }
+
+ virtual bool Show(bool show = true)
+ {
+ bool rv = wxFrame::Show(show);
+ if (rv && show)
+ ActivateParent();
+#ifdef __WXMAC__
+ GetParent()->Refresh(false);
+#endif
+ return rv;
+ }
+
+ void OnActivate(wxListEvent& WXUNUSED(event))
+ {
doubleClickAction(doubleClickActionData);
}
BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow)
- EVT_SET_FOCUS ( wxSTCListBoxWin::OnFocus)
- EVT_SIZE ( wxSTCListBoxWin::OnSize)
- EVT_LIST_ITEM_ACTIVATED(-1, wxSTCListBoxWin::OnActivate)
+ EVT_SET_FOCUS ( wxSTCListBoxWin::OnFocus)
+ EVT_SIZE ( wxSTCListBoxWin::OnSize)
+ EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
END_EVENT_TABLE()
+#endif // wxUSE_POPUPWIN -----------------------------------
inline wxSTCListBoxWin* GETLBW(WindowID win) {
bool unicodeMode;
int desiredVisibleRows;
int aveCharWidth;
- int maxStrWidth;
+ size_t maxStrWidth;
+ Point location; // Caret location at which the list is opened
wxImageList* imgList;
wxArrayInt* imgTypeMap;
public:
ListBoxImpl();
~ListBoxImpl();
+ static ListBox *Allocate();
virtual void SetFont(Font &font);
- virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_);
+ virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_);
virtual void SetAverageCharWidth(int width);
virtual void SetVisibleRows(int rows);
+ virtual int GetVisibleRows() const;
virtual PRectangle GetDesiredRect();
virtual int CaretFromEdge();
virtual void Clear();
virtual void Append(char *s, int type = -1);
+ void Append(const wxString& text, int type);
virtual int Length();
virtual void Select(int n);
virtual int GetSelection();
virtual int Find(const char *prefix);
virtual void GetValue(int n, char *value, int len);
- virtual void Sort();
virtual void RegisterImage(int type, const char *xpm_data);
+ void RegisterImageHelper(int type, wxBitmap& bmp);
+ virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage);
virtual void ClearRegisteredImages();
virtual void SetDoubleClickAction(CallBackAction, void *);
-
+ virtual void SetList(const char* list, char separator, char typesep);
};
}
ListBoxImpl::~ListBoxImpl() {
- if (imgList) {
- delete imgList;
- imgList = NULL;
- }
- if (imgTypeMap) {
- delete imgTypeMap;
- imgTypeMap = NULL;
- }
+ wxDELETE(imgList);
+ wxDELETE(imgTypeMap);
}
void ListBoxImpl::SetFont(Font &font) {
- GETLB(id)->SetFont(*((wxFont*)font.GetID()));
+ GETLB(wid)->SetFont(*((wxFont*)font.GetID()));
}
-void ListBoxImpl::Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_) {
+void ListBoxImpl::Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int WXUNUSED(technology_)) {
+ location = location_;
lineHeight = lineHeight_;
unicodeMode = unicodeMode_;
maxStrWidth = 0;
- id = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID);
+ wid = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID, location);
if (imgList != NULL)
- GETLB(id)->SetImageList(imgList, wxIMAGE_LIST_SMALL);
+ GETLB(wid)->SetImageList(imgList, wxIMAGE_LIST_SMALL);
}
}
+int ListBoxImpl::GetVisibleRows() const {
+ return desiredVisibleRows;
+}
+
PRectangle ListBoxImpl::GetDesiredRect() {
// wxListCtrl doesn't have a DoGetBestSize, so instead we kept track of
// the max size in Append and calculate it here...
- int maxw = maxStrWidth;
- int maxh = 0;
+ int maxw = maxStrWidth * aveCharWidth;
+ int maxh ;
// give it a default if there are no lines, and/or add a bit more
if (maxw == 0) maxw = 100;
maxw += aveCharWidth * 3 +
- GETLBW(id)->IconWidth() + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+ GETLBW(wid)->IconWidth() + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
if (maxw > 350)
maxw = 350;
// estimate a desired height
- int count = GETLB(id)->GetItemCount();
+ int count = GETLB(wid)->GetItemCount();
if (count) {
wxRect rect;
- GETLB(id)->GetItemRect(0, rect);
+ GETLB(wid)->GetItemRect(0, rect);
maxh = count * rect.GetHeight();
if (maxh > 140) // TODO: Use desiredVisibleRows??
maxh = 140;
int ListBoxImpl::CaretFromEdge() {
- return 4 + GETLBW(id)->IconWidth();
+ return 4 + GETLBW(wid)->IconWidth();
}
void ListBoxImpl::Clear() {
- GETLB(id)->DeleteAllItems();
+ GETLB(wid)->DeleteAllItems();
}
void ListBoxImpl::Append(char *s, int type) {
- wxString text = stc2wx(s);
- long count = GETLB(id)->GetItemCount();
- long itemID = GETLB(id)->InsertItem(count, wxEmptyString);
- GETLB(id)->SetItem(itemID, 1, text);
- int itemWidth = 0;
- GETLB(id)->GetTextExtent(text, &itemWidth, NULL);
- maxStrWidth = wxMax(maxStrWidth, itemWidth);
+ Append(stc2wx(s), type);
+}
+
+void ListBoxImpl::Append(const wxString& text, int type) {
+ long count = GETLB(wid)->GetItemCount();
+ long itemID = GETLB(wid)->InsertItem(count, wxEmptyString);
+ long idx = -1;
+ GETLB(wid)->SetItem(itemID, 1, text);
+ maxStrWidth = wxMax(maxStrWidth, text.length());
if (type != -1) {
wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
- long idx = imgTypeMap->Item(type);
- GETLB(id)->SetItemImage(itemID, idx, idx);
+ idx = imgTypeMap->Item(type);
}
+ GETLB(wid)->SetItemImage(itemID, idx, idx);
+}
+
+void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
+ GETLB(wid)->Freeze();
+ Clear();
+ wxStringTokenizer tkzr(stc2wx(list), (wxChar)separator);
+ while ( tkzr.HasMoreTokens() ) {
+ wxString token = tkzr.GetNextToken();
+ long type = -1;
+ int pos = token.Find(typesep);
+ if (pos != -1) {
+ token.Mid(pos+1).ToLong(&type);
+ token.Truncate(pos);
+ }
+ Append(token, (int)type);
+ }
+ GETLB(wid)->Thaw();
}
int ListBoxImpl::Length() {
- return GETLB(id)->GetItemCount();
+ return GETLB(wid)->GetItemCount();
}
void ListBoxImpl::Select(int n) {
- bool select = TRUE;
+ bool select = true;
if (n == -1) {
n = 0;
- select = FALSE;
+ select = false;
}
- GETLB(id)->Focus(n);
- GETLB(id)->Select(n, select);
+ GETLB(wid)->EnsureVisible(n);
+ GETLB(wid)->Select(n, select);
}
int ListBoxImpl::GetSelection() {
- return GETLB(id)->GetFirstSelected();
+ return GETLB(wid)->GetFirstSelected();
}
-int ListBoxImpl::Find(const char *prefix) {
+int ListBoxImpl::Find(const char *WXUNUSED(prefix)) {
// No longer used
- return -1;
+ return wxNOT_FOUND;
}
item.SetId(n);
item.SetColumn(1);
item.SetMask(wxLIST_MASK_TEXT);
- GETLB(id)->GetItem(item);
+ GETLB(wid)->GetItem(item);
strncpy(value, wx2stc(item.GetText()), len);
value[len-1] = '\0';
}
-void ListBoxImpl::Sort() {
-}
-
-
-void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
- wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
- wxBitmap bmp(wxImage(stream, wxBITMAP_TYPE_XPM));
-
+void ListBoxImpl::RegisterImageHelper(int type, wxBitmap& bmp)
+{
if (! imgList) {
// assumes all images are the same size
- imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), TRUE);
+ imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), true);
imgTypeMap = new wxArrayInt;
}
itm[type] = idx;
}
+void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
+ wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
+ wxImage img(stream, wxBITMAP_TYPE_XPM);
+ wxBitmap bmp(img);
+ RegisterImageHelper(type, bmp);
+}
+
+
+void ListBoxImpl::RegisterRGBAImage(int type, int width, int height,
+ const unsigned char *pixelsImage)
+{
+#ifdef wxHAS_RAW_BITMAP
+ wxBitmap bmp = BitmapFromRGBAImage(width, height, pixelsImage);
+ RegisterImageHelper(type, bmp);
+#endif
+}
+
+
void ListBoxImpl::ClearRegisteredImages() {
- if (imgList) {
- delete imgList;
- imgList = NULL;
- }
- if (imgTypeMap) {
- delete imgTypeMap;
- imgTypeMap = NULL;
- }
- if (id)
- GETLB(id)->SetImageList(NULL, wxIMAGE_LIST_SMALL);
+ wxDELETE(imgList);
+ wxDELETE(imgTypeMap);
+ if (wid)
+ GETLB(wid)->SetImageList(NULL, wxIMAGE_LIST_SMALL);
}
void ListBoxImpl::SetDoubleClickAction(CallBackAction action, void *data) {
- GETLBW(id)->SetDoubleClickAction(action, data);
+ GETLBW(wid)->SetDoubleClickAction(action, data);
}
-
ListBox::ListBox() {
}
//----------------------------------------------------------------------
-Menu::Menu() : id(0) {
+Menu::Menu() : mid(0) {
}
void Menu::CreatePopUp() {
Destroy();
- id = new wxMenu();
+ mid = new wxMenu();
}
void Menu::Destroy() {
- if (id)
- delete (wxMenu*)id;
- id = 0;
+ if (mid)
+ delete (wxMenu*)mid;
+ mid = 0;
}
void Menu::Show(Point pt, Window &w) {
- GETWIN(w.GetID())->PopupMenu((wxMenu*)id, pt.x - 4, pt.y);
+ GETWIN(w.GetID())->PopupMenu((wxMenu*)mid, pt.x - 4, pt.y);
Destroy();
}
//----------------------------------------------------------------------
-DynamicLibrary *DynamicLibrary::Load(const char *modulePath) {
+DynamicLibrary *DynamicLibrary::Load(const char *WXUNUSED(modulePath)) {
wxFAIL_MSG(wxT("Dynamic lexer loading not implemented yet"));
return NULL;
}
const char *Platform::DefaultFont() {
static char buf[128];
- strcpy(buf, wxNORMAL_FONT->GetFaceName().mbc_str());
+ wxStrlcpy(buf, wxNORMAL_FONT->GetFaceName().mbc_str(), WXSIZEOF(buf));
return buf;
}
}
bool Platform::MouseButtonBounce() {
- return FALSE;
-}
-void Platform::DebugDisplay(const char *s) {
- wxLogDebug(stc2wx(s));
+ return false;
}
-bool Platform::IsKeyDown(int key) {
+bool Platform::IsKeyDown(int WXUNUSED(key)) {
return false; // I don't think we'll need this.
}
void *lParam) {
wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;
- return stc->SendMsg(msg, wParam, (long)lParam);
+ return stc->SendMsg(msg, wParam, (wxIntPtr)lParam);
}
return b;
}
-#define TRACE
+//#define TRACE
+
+void Platform::DebugDisplay(const char *s) {
+#ifdef TRACE
+ wxLogDebug(stc2wx(s));
+#else
+ wxUnusedVar(s);
+#endif
+}
void Platform::DebugPrintf(const char *format, ...) {
#ifdef TRACE
vsprintf(buffer,format,pArguments);
va_end(pArguments);
Platform::DebugDisplay(buffer);
+#else
+ wxUnusedVar(format);
#endif
}
static bool assertionPopUps = true;
bool Platform::ShowAssertionPopUps(bool assertionPopUps_) {
- bool ret = assertionPopUps;
- assertionPopUps = assertionPopUps_;
- return ret;
+ bool ret = assertionPopUps;
+ assertionPopUps = assertionPopUps_;
+ return ret;
}
void Platform::Assert(const char *c, const char *file, int line) {
- char buffer[2000];
- sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
- if (assertionPopUps) {
- /*int idButton = */
- wxMessageBox(stc2wx(buffer),
- wxT("Assertion failure"),
- wxICON_HAND | wxOK);
-// if (idButton == IDRETRY) {
-// ::DebugBreak();
-// } else if (idButton == IDIGNORE) {
-// // all OK
-// } else {
-// abort();
-// }
- } else {
- strcat(buffer, "\r\n");
- Platform::DebugDisplay(buffer);
- abort();
- }
+#ifdef TRACE
+ char buffer[2000];
+ sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
+ if (assertionPopUps) {
+ /*int idButton = */
+ wxMessageBox(stc2wx(buffer),
+ wxT("Assertion failure"),
+ wxICON_HAND | wxOK);
+ } else {
+ strcat(buffer, "\r\n");
+ Platform::DebugDisplay(buffer);
+ abort();
+ }
+#else
+ wxUnusedVar(c);
+ wxUnusedVar(file);
+ wxUnusedVar(line);
+#endif
}
}
-bool Platform::IsDBCSLeadByte(int codePage, char ch) {
+bool Platform::IsDBCSLeadByte(int WXUNUSED(codePage), char WXUNUSED(ch)) {
return false;
}
-int Platform::DBCSCharLength(int codePage, const char *s) {
- return 0;
+int Platform::DBCSCharLength(int WXUNUSED(codePage), const char *WXUNUSED(s)) {
+ return 1;
}
int Platform::DBCSCharMaxLength() {
- return 0;
+ return 1;
}
//----------------------------------------------------------------------
ElapsedTime::ElapsedTime() {
- wxStartTimer();
+ wxLongLong localTime = wxGetLocalTimeMillis();
+ littleBit = localTime.GetLo();
+ bigBit = localTime.GetHi();
}
double ElapsedTime::Duration(bool reset) {
- double result = wxGetElapsedTime(reset);
+ wxLongLong prevTime(bigBit, littleBit);
+ wxLongLong localTime = wxGetLocalTimeMillis();
+ if(reset) {
+ littleBit = localTime.GetLo();
+ bigBit = localTime.GetHi();
+ }
+ wxLongLong duration = localTime - prevTime;
+ double result = duration.ToDouble();
result /= 1000.0;
return result;
}
//----------------------------------------------------------------------
#if wxUSE_UNICODE
+
+#include "UniConversion.h"
+
+// Convert using Scintilla's functions instead of wx's, Scintilla's are more
+// forgiving and won't assert...
+
wxString stc2wx(const char* str, size_t len)
{
- char *buffer=new char[len+1];
- strncpy(buffer, str, len);
- buffer[len]=0;
+ if (!len)
+ return wxEmptyString;
- wxString cstr(buffer, wxConvUTF8);
+ size_t wclen = UTF16Length(str, len);
+ wxWCharBuffer buffer(wclen+1);
- delete[] buffer;
- return cstr;
+ size_t actualLen = UTF16FromUTF8(str, len, buffer.data(), wclen+1);
+ return wxString(buffer.data(), actualLen);
}
-#endif
+wxString stc2wx(const char* str)
+{
+ return stc2wx(str, strlen(str));
+}
+
+
+wxWX2MBbuf wx2stc(const wxString& str)
+{
+ const wchar_t* wcstr = str.c_str();
+ size_t wclen = str.length();
+ size_t len = UTF8Length(wcstr, wclen);
+ wxCharBuffer buffer(len+1);
+ UTF8FromUTF16(wcstr, wclen, buffer.data(), len);
+ // TODO check NULL termination!!
+
+ return buffer;
+}
+
+#endif
+#endif // wxUSE_STC