#include "wx/imaglist.h"
#include "wx/tokenzr.h"
-#ifdef wxHAVE_RAW_BITMAP
+#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/private.h"
-
Point Point::FromLong(long lpoint) {
return Point(lpoint & 0xFFFF, lpoint >> 16);
}
rc.GetRight()+1, rc.GetBottom()+1);
}
-wxColour wxColourFromCA(const ColourAllocated& ca) {
- ColourDesired cd(ca.AsLong());
+wxColour wxColourFromCD(ColourDesired& cd) {
return wxColour((unsigned char)cd.GetRed(),
(unsigned char)cd.GetGreen(),
(unsigned char)cd.GetBlue());
}
-//----------------------------------------------------------------------
-
-Palette::Palette() {
- used = 0;
- allowRealization = false;
- size = 100;
- entries = new ColourPair[size];
-}
-
-Palette::~Palette() {
- Release();
- delete [] entries;
- entries = 0;
-}
-
-void Palette::Release() {
- used = 0;
- delete [] entries;
- size = 100;
- entries = new ColourPair[size];
-}
-
-// 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 >= size) {
- int sizeNew = size * 2;
- ColourPair *entriesNew = new ColourPair[sizeNew];
- for (int j=0; j<size; j++) {
- entriesNew[j] = entries[j];
- }
- delete []entries;
- entries = entriesNew;
- size = sizeNew;
- }
-
- 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) {
- }
+wxColour wxColourFromCDandAlpha(ColourDesired& cd, int alpha) {
+ return wxColour((unsigned char)cd.GetRed(),
+ (unsigned char)cd.GetGreen(),
+ (unsigned char)cd.GetBlue(),
+ (unsigned char)alpha);
}
-
//----------------------------------------------------------------------
Font::Font() {
- id = 0;
+ fid = 0;
ascent = 0;
}
Font::~Font() {
}
-void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag) {
-
+void Font::Create(const FontParameters &fp) {
Release();
- // The minus one is done because since Scintilla uses SC_SHARSET_DEFAULT
+ // 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)(characterSet-1);
+ wxFontEncoding encoding = (wxFontEncoding)(fp.characterSet-1);
wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
if (ea.GetCount())
encoding = ea[0];
- wxFont* font = new wxFont(size,
- wxDEFAULT,
- italic ? wxITALIC : wxNORMAL,
- bold ? wxBOLD : wxNORMAL,
- false,
- stc2wx(faceName),
- encoding);
- //font->SetNoAntiAliasing(!extraFontFlag);
- id = font;
+ 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 AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
- ColourAllocated outline, int alphaOutline, int flags);
- 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_);
};
}
-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);
}
-#ifdef __WXMSW__
+#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,
- ColourAllocated fill, int alphaFill,
- ColourAllocated outline, int alphaOutline,
+ ColourDesired fill, int alphaFill,
+ ColourDesired outline, int alphaOutline,
int /*flags*/) {
-#ifdef wxHAVE_RAW_BITMAP
+#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);
- wxAlphaPixelData pixData(bmp);
- // Set the fill pixels
- ColourDesired cdf(fill.AsLong());
- int red = cdf.GetRed();
- int green = cdf.GetGreen();
- int blue = cdf.GetBlue();
+ // 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;
+ }
+ }
- wxAlphaPixelData::Iterator p(pixData);
- for (y=0; y<r.height; y++) {
- p.MoveTo(pixData, 0, y);
+ // 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.Red() = wxPy_premultiply(red, alphaFill);
- p.Green() = wxPy_premultiply(green, alphaFill);
- p.Blue() = wxPy_premultiply(blue, alphaFill);
- p.Alpha() = alphaFill;
- ++p;
+ 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;
}
- }
- // 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;
+ }
}
- 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);
wxUnusedVar(alphaOutline);
RectangleDraw(rc, outline, fill);
#endif
+#endif
}
-void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
+#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));
+ hdc->SetTextForeground(wxColourFromCD(fore));
+ hdc->SetTextBackground(wxColourFromCD(back));
FillRectangle(rc, back);
// ybase is where the baseline should be, but wxWin uses the upper left
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));
+ hdc->SetTextForeground(wxColourFromCD(fore));
+ hdc->SetTextBackground(wxColourFromCD(back));
FillRectangle(rc, back);
hdc->SetClippingRegion(wxRectFromPRectangle(rc));
}
-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);
wxArrayInt tpos;
#else
// If not unicode then just use the widths we have
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
std::copy(tpos.begin(), tpos.end(), positions);
#else
memcpy(positions, tpos.begin(), len * sizeof(int));
}
-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 &WXUNUSED(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() + 1;
}
-int SurfaceImpl::AverageCharWidth(Font &font) {
+XYPOSITION SurfaceImpl::AverageCharWidth(Font &font) {
SetFont(font);
return hdc->GetCharWidth();
}
-int SurfaceImpl::SetPalette(Palette *WXUNUSED(pal), bool WXUNUSED(inBackGround)) {
- return 0;
-}
-
void SurfaceImpl::SetClip(PRectangle rc) {
hdc->SetClippingRegion(wxRectFromPRectangle(rc));
}
}
-Surface *Surface::Allocate() {
+Surface *Surface::Allocate(int WXUNUSED(technology)) {
return new SurfaceImpl;
}
}
void Window::Destroy() {
- if (id) {
+ if (wid) {
Show(false);
- GETWIN(id)->Destroy();
+ 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);
+ GETWIN(wid)->Refresh(false);
}
void Window::InvalidateRectangle(PRectangle rc) {
wxRect r = wxRectFromPRectangle(rc);
- GETWIN(id)->Refresh(false, &r);
+ 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:
cursorId = wxCURSOR_ARROW;
break;
}
-#ifdef __WXMOTIF__
- wxCursor wc = wxStockCursor(cursorId) ;
-#else
- wxCursor wc = wxCursor(cursorId) ;
-#endif
- if(curs != cursorLast)
- {
- GETWIN(id)->SetCursor(wc);
- cursorLast = curs;
- }
+
+ wxCursor wc = wxCursor(cursorId);
+ if(curs != cursorLast)
+ {
+ GETWIN(wid)->SetCursor(wc);
+ cursorLast = curs;
+ }
}
void Window::SetTitle(const char *s) {
- GETWIN(id)->SetLabel(stc2wx(s));
+ GETWIN(wid)->SetLabel(stc2wx(s));
}
// Returns rectangle of monitor pt is on
PRectangle Window::GetMonitorRect(Point pt) {
wxRect rect;
- if (! id) return PRectangle();
+ 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);
}
#if wxUSE_POPUPWIN //-----------------------------------
#include "wx/popupwin.h"
-
-//
-// TODO: Refactor these two classes to have a common base (or a mix-in) to get
-// rid of the code duplication. (Either that or convince somebody to
-// implement wxPopupWindow for the Mac!!)
-//
-// In the meantime, be careful to duplicate any changes as needed...
-//
-
// A popup window to place the wxSTCListBox upon
class wxSTCListBoxWin : public wxPopupWindow
{
void* doubleClickActionData;
public:
wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
- wxPopupWindow(parent, wxBORDER_NONE)
+ wxPopupWindow(parent, wxBORDER_SIMPLE)
{
-
- SetBackgroundColour(*wxBLACK); // for our simple border
lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,
wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxBORDER_NONE);
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
}
}
void OnSize(wxSizeEvent& event) {
- // resize the child
- wxSize sz = GetSize();
- sz.x -= 2;
- sz.y -= 2;
- lv->SetSize(1, 1, sz.x, sz.y);
+ // resize the child to fill the popup
+ wxSize sz = GetClientSize();
+ 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, sz.x - 2 - lv->GetColumnWidth(0) -
+ lv->SetColumnWidth(1, w - 2 - lv->GetColumnWidth(0) -
wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
event.Skip();
}
wxFRAME_NO_TASKBAR
| wxFRAME_FLOAT_ON_PARENT
#ifdef __WXMAC__
- | wxPOPUP_WINDOW
+ | wxPOPUP_WINDOW
| wxNO_BORDER
#else
| wxSIMPLE_BORDER
lv->SetFocus();
Hide();
- }
+ }
// On OSX and (possibly others) there can still be pending
if (frame)
frame->Raise();
}
-
+
virtual void DoSetSize(int x, int y,
int width, int height,
public:
ListBoxImpl();
~ListBoxImpl();
+ static ListBox *Allocate();
virtual void SetFont(Font &font);
- virtual void Create(Window &parent, int ctrlID, Point location_, 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 int Find(const char *prefix);
virtual void GetValue(int n, char *value, int len);
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, Point location_, 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, location);
+ 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);
}
// 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(const wxString& text, int type) {
- long count = GETLB(id)->GetItemCount();
- long itemID = GETLB(id)->InsertItem(count, wxEmptyString);
- GETLB(id)->SetItem(itemID, 1, text);
+ 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(id)->Freeze();
+ GETLB(wid)->Freeze();
Clear();
wxStringTokenizer tkzr(stc2wx(list), (wxChar)separator);
while ( tkzr.HasMoreTokens() ) {
}
Append(token, (int)type);
}
- GETLB(id)->Thaw();
+ GETLB(wid)->Thaw();
}
int ListBoxImpl::Length() {
- return GETLB(id)->GetItemCount();
+ return GETLB(wid)->GetItemCount();
}
n = 0;
select = false;
}
- GETLB(id)->EnsureVisible(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();
}
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::RegisterImage(int type, const char *xpm_data) {
- wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
- wxImage img(stream, wxBITMAP_TYPE_XPM);
- wxBitmap bmp(img);
-
+void ListBoxImpl::RegisterImageHelper(int type, wxBitmap& bmp)
+{
if (! imgList) {
// assumes all images are the same size
imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), true);
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);
}
//----------------------------------------------------------------------
-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();
}
void *lParam) {
wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;
- return stc->SendMsg(msg, wParam, (long)lParam);
+ return stc->SendMsg(msg, wParam, (wxIntPtr)lParam);
}
}
-const wxWX2MBbuf wx2stc(const wxString& str)
+wxWX2MBbuf wx2stc(const wxString& str)
{
const wchar_t* wcstr = str.c_str();
size_t wclen = str.length();
projects / wxWidgets.git / blobdiff