Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / stc / PlatWX.cpp

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index b3232e6aa575dc3bed12e58b861df13b4d53d49f..c92a71592d42a7113aa65d7a3e2ebbb6f83a2583 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -4,23 +4,45 @@
 //                        Robin Dunn <robin@aldunn.com>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 //                        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 <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"
 
 #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) {
 
 
 Point Point::FromLong(long lpoint) {


@@ -45,19 +67,33 @@ wxColour wxColourFromCA(const ColourAllocated& ca) {
                     (unsigned char)cd.GetBlue());
 }
 
                     (unsigned char)cd.GetBlue());
 }
 

+wxColour wxColourFromCAandAlpha(const ColourAllocated& ca, int alpha) {
+    ColourDesired cd(ca.AsLong());
+    return wxColour((unsigned char)cd.GetRed(),
+                    (unsigned char)cd.GetGreen(),
+                    (unsigned char)cd.GetBlue(),
+                    (unsigned char)alpha);
+}
+

 //----------------------------------------------------------------------
 
 Palette::Palette() {
     used = 0;
     allowRealization = false;
 //----------------------------------------------------------------------
 
 Palette::Palette() {
     used = 0;
     allowRealization = false;

+    size = 100;
+    entries = new ColourPair[size];

 }
 
 Palette::~Palette() {
     Release();
 }
 
 Palette::~Palette() {
     Release();

+    wxDELETEA(entries);

 }
 
 void Palette::Release() {
     used = 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)
 }
 
 // This method either adds a colour to the list of wanted colours (want==true)


@@ -70,11 +106,20 @@ void Palette::WantFind(ColourPair &cp, bool want) {
                 return;
         }
 
                 return;
         }
 

-        if (used < numEntries) {
-            entries[used].desired = cp.desired;
-            entries[used].allocated.Set(cp.desired.AsLong());
-            used++;
+        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) {
     } else {
         for (int i=0; i < used; i++) {
             if (entries[i].desired == cp.desired) {


@@ -95,93 +140,23 @@ void Palette::Allocate(Window &) {
 //----------------------------------------------------------------------
 
 Font::Font() {
 //----------------------------------------------------------------------
 
 Font::Font() {

-    id = 0;
+    fid = 0;

     ascent = 0;
 }
 
 Font::~Font() {
 }
 
     ascent = 0;
 }
 
 Font::~Font() {
 }
 

-void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag) {
-    wxFontEncoding encoding;
-
+void Font::Create(const char *faceName, int characterSet,
+                  int size, bool bold, bool italic,
+                  int WXUNUSED(extraFontFlag)) {

     Release();
 
     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_SHARSET_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);

 
     wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
     if (ea.GetCount())
 
     wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
     if (ea.GetCount())


@@ -194,15 +169,14 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b
                     false,
                     stc2wx(faceName),
                     encoding);
                     false,
                     stc2wx(faceName),
                     encoding);

-    font->SetNoAntiAliasing(!extraFontFlag);
-    id = font;
+    fid = font;

 }
 
 
 void Font::Release() {
 }
 
 
 void Font::Release() {

-    if (id)
-        delete (wxFont*)id;
-    id = 0;
+    if (fid)
+        delete (wxFont*)fid;
+    fid = 0;

 }
 
 //----------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------


@@ -236,6 +210,8 @@ public:
     virtual void FillRectangle(PRectangle rc, ColourAllocated back);
     virtual void FillRectangle(PRectangle rc, Surface &surfacePattern);
     virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
     virtual void FillRectangle(PRectangle rc, ColourAllocated 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 Copy(PRectangle rc, Point from, Surface &surfaceSource);
 
     virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
     virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource);
 


@@ -323,11 +299,11 @@ bool SurfaceImpl::Initialised() {
 
 
 void SurfaceImpl::PenColour(ColourAllocated fore) {
 
 
 void SurfaceImpl::PenColour(ColourAllocated fore) {

-    hdc->SetPen(wxPen(wxColourFromCA(fore), 1, wxSOLID));
+    hdc->SetPen(wxPen(wxColourFromCA(fore)));

 }
 
 void SurfaceImpl::BrushColour(ColourAllocated back) {
 }
 
 void SurfaceImpl::BrushColour(ColourAllocated back) {

-    hdc->SetBrush(wxBrush(wxColourFromCA(back), wxSOLID));
+    hdc->SetBrush(wxBrush(wxColourFromCA(back)));

 }
 
 void SurfaceImpl::SetFont(Font &font_) {
 }
 
 void SurfaceImpl::SetFont(Font &font_) {


@@ -378,7 +354,7 @@ void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) {
     if (((SurfaceImpl&)surfacePattern).bitmap)
         br = wxBrush(*((SurfaceImpl&)surfacePattern).bitmap);
     else    // Something is wrong so display in red
     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));
     hdc->SetPen(*wxTRANSPARENT_PEN);
     hdc->SetBrush(br);
     hdc->DrawRectangle(wxRectFromPRectangle(rc));


@@ -390,6 +366,97 @@ void SurfaceImpl::RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAl
     hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 4);
 }
 
     hdc->DrawRoundedRectangle(wxRectFromPRectangle(rc), 4);
 }
 

+#ifdef __WXMSW__
+#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,
+                                 int /*flags*/) {
+#if wxUSE_GRAPHICS_CONTEXT
+    wxGCDC dc(*(wxMemoryDC*)hdc);
+    wxColour penColour(wxColourFromCAandAlpha(outline, alphaOutline));
+    wxColour brushColour(wxColourFromCAandAlpha(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();
+
+    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
+}
+

 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
     PenColour(fore);
     BrushColour(back);
 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
     PenColour(fore);
     BrushColour(back);


@@ -437,13 +504,13 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
 
     SetFont(font);
     hdc->SetTextForeground(wxColourFromCA(fore));
 
     SetFont(font);
     hdc->SetTextForeground(wxColourFromCA(fore));

-    hdc->SetBackgroundMode(wxTRANSPARENT);
+    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);
 
 
     // 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);

 }
 
 
 }
 
 


@@ -478,8 +545,12 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
 #else
 
     // If not unicode then just use the widths we have
 #else
 
     // If not unicode then just use the widths we have

+#if wxUSE_STD_CONTAINERS
+    std::copy(tpos.begin(), tpos.end(), positions);
+#else

     memcpy(positions, tpos.begin(), len * sizeof(int));
 #endif
     memcpy(positions, tpos.begin(), len * sizeof(int));
 #endif

+#endif

 }
 
 
 }
 
 


@@ -575,26 +646,26 @@ Window::~Window() {
 }
 
 void Window::Destroy() {
 }
 
 void Window::Destroy() {

-    if (id) {
+    if (wid) {

         Show(false);
         Show(false);

-        GETWIN(id)->Destroy();
+        GETWIN(wid)->Destroy();

     }
     }

-    id = 0;
+    wid = 0;

 }
 
 bool Window::HasFocus() {
 }
 
 bool Window::HasFocus() {

-    return wxWindow::FindFocus() == GETWIN(id);
+    return wxWindow::FindFocus() == GETWIN(wid);

 }
 
 PRectangle Window::GetPosition() {
 }
 
 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);
     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) {
 }
 
 void Window::SetPositionRelative(PRectangle rc, Window) {


@@ -602,32 +673,30 @@ void Window::SetPositionRelative(PRectangle rc, Window) {
 }
 
 PRectangle Window::GetClientPosition() {
 }
 
 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) {
     return  PRectangle(0, 0, sz.x, sz.y);
 }
 
 void Window::Show(bool show) {

-    GETWIN(id)->Show(show);
+    GETWIN(wid)->Show(show);

 }
 
 void Window::InvalidateAll() {
 }
 
 void Window::InvalidateAll() {

-    GETWIN(id)->Refresh(false);
-    wxWakeUpIdle();
+    GETWIN(wid)->Refresh(false);

 }
 
 void Window::InvalidateRectangle(PRectangle rc) {
     wxRect r = wxRectFromPRectangle(rc);
 }
 
 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) {
 }
 
 void Window::SetFont(Font &font) {

-    GETWIN(id)->SetFont(*((wxFont*)font.GetID()));
+    GETWIN(wid)->SetFont(*((wxFont*)font.GetID()));

 }
 
 void Window::SetCursor(Cursor curs) {
 }
 
 void Window::SetCursor(Cursor curs) {

-    int cursorId;
+    wxStockCursor cursorId;

 
     switch (curs) {
     case cursorText:
 
     switch (curs) {
     case cursorText:


@@ -658,20 +727,36 @@ void Window::SetCursor(Cursor curs) {
         cursorId = wxCURSOR_ARROW;
         break;
     }
         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) {
 }
 
 
 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
 
 //----------------------------------------------------------------------
 // Helper classes for ListBox
 


@@ -683,8 +768,13 @@ public:
     wxSTCListBox(wxWindow* parent, wxWindowID id,
                  const wxPoint& pos, const wxSize& size,
                  long style)
     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) {
 
 
     void OnFocus(wxFocusEvent& event) {


@@ -728,16 +818,145 @@ END_EVENT_TABLE()
 
 
 
 
 
 

+#if wxUSE_POPUPWIN //-----------------------------------
+#include "wx/popupwin.h"
+
+// 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, Point WXUNUSED(location)) :
+        wxPopupWindow(parent, wxBORDER_SIMPLE)
+    {
+
+        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);
+
+        // 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
+    }
+
+
+    // 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) {
+            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) {
+        GetParent()->SetFocus();
+        event.Skip();
+    }
+
+    void OnSize(wxSizeEvent& event) {
+        // resize the child to fill the popup
+        wxSize sz = GetClientSize();
+        lv->SetSize(0, 0, sz.x, sz.y);
+        // reset the column widths
+        lv->SetColumnWidth(0, IconWidth()+4);
+        lv->SetColumnWidth(1, sz.x - 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 window to place the wxSTCListBox upon
-class wxSTCListBoxWin : public wxWindow {
+// 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:
 private:
     wxListView*         lv;
     CallBackAction      doubleClickAction;
     void*               doubleClickActionData;
 public:

-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id) :
-        wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxSIMPLE_BORDER )
+    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,
     {
 
         lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,


@@ -758,7 +977,8 @@ public:
     // messages/events for the list control when Scintilla wants to
     // close it, so do a pending delete of it instead of destroying
     // immediately.
     // 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() {
+    bool Destroy()
+    {

 #ifdef __WXMAC__
         // The bottom edge of this window is not getting properly
         // refreshed upon deletion, so help it out...
 #ifdef __WXMAC__
         // The bottom edge of this window is not getting properly
         // refreshed upon deletion, so help it out...


@@ -773,7 +993,8 @@ public:
     }
 
 
     }
 
 

-    int IconWidth() {
+    int IconWidth()
+    {

         wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
         if (il != NULL) {
             int w, h;
         wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
         if (il != NULL) {
             int w, h;


@@ -784,18 +1005,22 @@ public:
     }
 
 
     }
 
 

-    void SetDoubleClickAction(CallBackAction action, void *data) {
+    void SetDoubleClickAction(CallBackAction action, void *data)
+    {

         doubleClickAction = action;
         doubleClickActionData = data;
     }
 
 
         doubleClickAction = action;
         doubleClickActionData = data;
     }
 
 

-    void OnFocus(wxFocusEvent& event) {
+    void OnFocus(wxFocusEvent& event)
+    {
+        ActivateParent();

         GetParent()->SetFocus();
         event.Skip();
     }
 
         GetParent()->SetFocus();
         event.Skip();
     }
 

-    void OnSize(wxSizeEvent& event) {
+    void OnSize(wxSizeEvent& event)
+    {

         // resize the child
         wxSize sz = GetClientSize();
         lv->SetSize(sz);
         // resize the child
         wxSize sz = GetClientSize();
         lv->SetSize(sz);


@@ -806,7 +1031,44 @@ public:
         event.Skip();
     }
 
         event.Skip();
     }
 

-    void OnActivate(wxListEvent& WXUNUSED(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);
     }
 
         doubleClickAction(doubleClickActionData);
     }
 


@@ -823,6 +1085,7 @@ BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow)
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 

+#endif // wxUSE_POPUPWIN -----------------------------------

 
 
 inline wxSTCListBoxWin* GETLBW(WindowID win) {
 
 
 inline wxSTCListBoxWin* GETLBW(WindowID win) {


@@ -841,7 +1104,8 @@ private:
     bool                unicodeMode;
     int                 desiredVisibleRows;
     int                 aveCharWidth;
     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;
 
     wxImageList*        imgList;
     wxArrayInt*         imgTypeMap;
 


@@ -850,13 +1114,15 @@ public:
     ~ListBoxImpl();
 
     virtual void SetFont(Font &font);
     ~ListBoxImpl();
 
     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_);

     virtual void SetAverageCharWidth(int width);
     virtual void SetVisibleRows(int rows);
     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);
     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 Length();
     virtual void Select(int n);
     virtual int GetSelection();


@@ -865,7 +1131,7 @@ public:
     virtual void RegisterImage(int type, const char *xpm_data);
     virtual void ClearRegisteredImages();
     virtual void SetDoubleClickAction(CallBackAction, void *);
     virtual void RegisterImage(int type, const char *xpm_data);
     virtual void ClearRegisteredImages();
     virtual void SetDoubleClickAction(CallBackAction, void *);

-
+    virtual void SetList(const char* list, char separator, char typesep);

 };
 
 
 };
 
 


@@ -877,29 +1143,24 @@ ListBoxImpl::ListBoxImpl()
 }
 
 ListBoxImpl::~ListBoxImpl() {
 }
 
 ListBoxImpl::~ListBoxImpl() {

-    if (imgList) {
-        delete imgList;
-        imgList = NULL;
-    }
-    if (imgTypeMap) {
-        delete imgTypeMap;
-        imgTypeMap = NULL;
-    }
+    wxDELETE(imgList);
+    wxDELETE(imgTypeMap);

 }
 
 
 void ListBoxImpl::SetFont(Font &font) {
 }
 
 
 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_) {
+    location = location_;

     lineHeight =  lineHeight_;
     unicodeMode = unicodeMode_;
     maxStrWidth = 0;
     lineHeight =  lineHeight_;
     unicodeMode = unicodeMode_;
     maxStrWidth = 0;

-    id = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID);
+    wid = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID, location);

     if (imgList != NULL)
     if (imgList != NULL)

-        GETLB(id)->SetImageList(imgList, wxIMAGE_LIST_SMALL);
+        GETLB(wid)->SetImageList(imgList, wxIMAGE_LIST_SMALL);

 }
 
 
 }
 
 


@@ -913,24 +1174,28 @@ void ListBoxImpl::SetVisibleRows(int rows) {
 }
 
 
 }
 
 

+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...
 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 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 +
     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
     if (maxw > 350)
         maxw = 350;
 
     // estimate a desired height

-    int count = GETLB(id)->GetItemCount();
+    int count = GETLB(wid)->GetItemCount();

     if (count) {
         wxRect rect;
     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;
         maxh = count * rect.GetHeight();
         if (maxh > 140)  // TODO:  Use desiredVisibleRows??
             maxh = 140;


@@ -952,33 +1217,52 @@ PRectangle ListBoxImpl::GetDesiredRect() {
 
 
 int ListBoxImpl::CaretFromEdge() {
 
 
 int ListBoxImpl::CaretFromEdge() {

-    return 4 + GETLBW(id)->IconWidth();
+    return 4 + GETLBW(wid)->IconWidth();

 }
 
 
 void ListBoxImpl::Clear() {
 }
 
 
 void ListBoxImpl::Clear() {

-    GETLB(id)->DeleteAllItems();
+    GETLB(wid)->DeleteAllItems();

 }
 
 
 void ListBoxImpl::Append(char *s, int type) {
 }
 
 
 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"));
     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() {
 }
 
 
 int ListBoxImpl::Length() {

-    return GETLB(id)->GetItemCount();
+    return GETLB(wid)->GetItemCount();

 }
 
 
 }
 
 


@@ -988,13 +1272,13 @@ void ListBoxImpl::Select(int n) {
         n = 0;
         select = false;
     }
         n = 0;
         select = false;
     }

-    GETLB(id)->Focus(n);
-    GETLB(id)->Select(n, select);
+    GETLB(wid)->EnsureVisible(n);
+    GETLB(wid)->Select(n, select);

 }
 
 
 int ListBoxImpl::GetSelection() {
 }
 
 
 int ListBoxImpl::GetSelection() {

-    return GETLB(id)->GetFirstSelected();
+    return GETLB(wid)->GetFirstSelected();

 }
 
 
 }
 
 


@@ -1009,7 +1293,7 @@ void ListBoxImpl::GetValue(int n, char *value, int len) {
     item.SetId(n);
     item.SetColumn(1);
     item.SetMask(wxLIST_MASK_TEXT);
     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';
 }
     strncpy(value, wx2stc(item.GetText()), len);
     value[len-1] = '\0';
 }


@@ -1038,25 +1322,18 @@ void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
 }
 
 void ListBoxImpl::ClearRegisteredImages() {
 }
 
 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) {
 }
 
 
 void ListBoxImpl::SetDoubleClickAction(CallBackAction action, void *data) {

-    GETLBW(id)->SetDoubleClickAction(action, data);
+    GETLBW(wid)->SetDoubleClickAction(action, data);

 }
 
 
 }
 
 

-

 ListBox::ListBox() {
 }
 
 ListBox::ListBox() {
 }
 


@@ -1069,22 +1346,22 @@ ListBox *ListBox::Allocate() {
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-Menu::Menu() : id(0) {
+Menu::Menu() : mid(0) {

 }
 
 void Menu::CreatePopUp() {
     Destroy();
 }
 
 void Menu::CreatePopUp() {
     Destroy();

-    id = new wxMenu();
+    mid = new wxMenu();

 }
 
 void Menu::Destroy() {
 }
 
 void Menu::Destroy() {

-    if (id)
-        delete (wxMenu*)id;
-    id = 0;
+    if (mid)
+        delete (wxMenu*)mid;
+    mid = 0;

 }
 
 void Menu::Show(Point pt, Window &w) {
 }
 
 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();
 }
 
     Destroy();
 }
 


@@ -1126,9 +1403,6 @@ unsigned int Platform::DoubleClickTime() {
 bool Platform::MouseButtonBounce() {
     return false;
 }
 bool Platform::MouseButtonBounce() {
     return false;
 }

-void Platform::DebugDisplay(const char *s) {
-    wxLogDebug(stc2wx(s));
-}

 
 bool Platform::IsKeyDown(int WXUNUSED(key)) {
     return false;  // I don't think we'll need this.
 
 bool Platform::IsKeyDown(int WXUNUSED(key)) {
     return false;  // I don't think we'll need this.


@@ -1149,7 +1423,7 @@ long Platform::SendScintillaPointer(WindowID w,
                                     void *lParam) {
 
     wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;
                                     void *lParam) {
 
     wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w;

-    return stc->SendMsg(msg, wParam, (long)lParam);
+    return stc->SendMsg(msg, wParam, (wxIntPtr)lParam);

 }
 
 
 }
 
 


@@ -1169,7 +1443,15 @@ int Platform::Maximum(int a, int b) {
         return b;
 }
 
         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
 
 void Platform::DebugPrintf(const char *format, ...) {
 #ifdef TRACE


@@ -1179,6 +1461,8 @@ void Platform::DebugPrintf(const char *format, ...) {
     vsprintf(buffer,format,pArguments);
     va_end(pArguments);
     Platform::DebugDisplay(buffer);
     vsprintf(buffer,format,pArguments);
     va_end(pArguments);
     Platform::DebugDisplay(buffer);

+#else
+    wxUnusedVar(format);

 #endif
 }
 
 #endif
 }
 


@@ -1192,6 +1476,7 @@ bool Platform::ShowAssertionPopUps(bool assertionPopUps_) {
 }
 
 void Platform::Assert(const char *c, const char *file, int line) {
 }
 
 void Platform::Assert(const char *c, const char *file, int line) {

+#ifdef TRACE

     char buffer[2000];
     sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
     if (assertionPopUps) {
     char buffer[2000];
     sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
     if (assertionPopUps) {


@@ -1199,18 +1484,16 @@ void Platform::Assert(const char *c, const char *file, int line) {
         wxMessageBox(stc2wx(buffer),
                      wxT("Assertion failure"),
                      wxICON_HAND | wxOK);
         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();
     }
     } else {
         strcat(buffer, "\r\n");
         Platform::DebugDisplay(buffer);
         abort();
     }

+#else
+    wxUnusedVar(c);
+    wxUnusedVar(file);
+    wxUnusedVar(line);
+#endif

 }
 
 
 }
 
 


@@ -1239,11 +1522,20 @@ int Platform::DBCSCharMaxLength() {
 //----------------------------------------------------------------------
 
 ElapsedTime::ElapsedTime() {
 //----------------------------------------------------------------------
 
 ElapsedTime::ElapsedTime() {

-    wxStartTimer();
+    wxLongLong localTime = wxGetLocalTimeMillis();
+    littleBit = localTime.GetLo();
+    bigBit = localTime.GetHi();

 }
 
 double ElapsedTime::Duration(bool reset) {
 }
 
 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;
 }
     result /= 1000.0;
     return result;
 }


@@ -1263,10 +1555,10 @@ wxString stc2wx(const char* str, size_t len)
     if (!len)
         return wxEmptyString;
 
     if (!len)
         return wxEmptyString;
 

-    size_t wclen = UCS2Length(str, len);
+    size_t wclen = UTF16Length(str, len);

     wxWCharBuffer buffer(wclen+1);
 
     wxWCharBuffer buffer(wclen+1);
 

-    size_t actualLen = UCS2FromUTF8(str, len, buffer.data(), wclen+1);
+    size_t actualLen = UTF16FromUTF8(str, len, buffer.data(), wclen+1);

     return wxString(buffer.data(), actualLen);
 }
 
     return wxString(buffer.data(), actualLen);
 }
 


@@ -1285,7 +1577,7 @@ const wxWX2MBbuf wx2stc(const wxString& str)
     size_t len           = UTF8Length(wcstr, wclen);
 
     wxCharBuffer buffer(len+1);
     size_t len           = UTF8Length(wcstr, wclen);
 
     wxCharBuffer buffer(len+1);

-    UTF8FromUCS2(wcstr, wclen, buffer.data(), len);
+    UTF8FromUTF16(wcstr, wclen, buffer.data(), len);

 
     // TODO check NULL termination!!
 
 
     // TODO check NULL termination!!
 


@@ -1294,8 +1586,4 @@ const wxWX2MBbuf wx2stc(const wxString& str)
 
 #endif
 
 
 #endif
 

-
-
-
-
-
+#endif // wxUSE_STC