Allow an app to cut down start time by not doing unnecessary mime types initialisation

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

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 07566a804016ae1d4464453fee68375483ce98c7..f7e2de3c0c37e88a37428f6ffa15a954c37ba7e1 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -4,18 +4,42 @@
 //                        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"
+#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/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

 
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"
 
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"

+#include "wx/stc/private.h"

 
 
 
 
 
 


@@ -46,14 +70,21 @@ wxColour wxColourFromCA(const ColourAllocated& ca) {
 Palette::Palette() {
     used = 0;
     allowRealization = false;
 Palette::Palette() {
     used = 0;
     allowRealization = false;

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

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

+    delete [] entries;
+    entries = 0;

 }
 
 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)


@@ -66,11 +97,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) {


@@ -98,8 +138,9 @@ Font::Font() {
 Font::~Font() {
 }
 
 Font::~Font() {
 }
 

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

     Release();
 
     // The minus one is done because since Scintilla uses SC_SHARSET_DEFAULT
     Release();
 
     // The minus one is done because since Scintilla uses SC_SHARSET_DEFAULT


@@ -107,7 +148,7 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b
     // so we adjust the encoding before passing it to Scintilla.  See also
     // wxStyledTextCtrl::StyleSetCharacterSet
     wxFontEncoding encoding = (wxFontEncoding)(characterSet-1);
     // 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())
         encoding = ea[0];
     wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
     if (ea.GetCount())
         encoding = ea[0];


@@ -161,6 +202,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);
 


@@ -248,11 +291,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_) {


@@ -303,7 +346,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));


@@ -315,6 +358,86 @@ 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*/) {
+#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
+}
+

 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);


@@ -362,13 +485,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);

 }
 
 
 }
 
 


@@ -542,13 +665,11 @@ void Window::Show(bool show) {
 
 void Window::InvalidateAll() {
     GETWIN(id)->Refresh(false);
 
 void Window::InvalidateAll() {
     GETWIN(id)->Refresh(false);

-    wxWakeUpIdle();

 }
 
 void Window::InvalidateRectangle(PRectangle rc) {
     wxRect r = wxRectFromPRectangle(rc);
     GETWIN(id)->Refresh(false, &r);
 }
 
 void Window::InvalidateRectangle(PRectangle rc) {
     wxRect r = wxRectFromPRectangle(rc);
     GETWIN(id)->Refresh(false, &r);

-    wxWakeUpIdle();

 }
 
 void Window::SetFont(Font &font) {
 }
 
 void Window::SetFont(Font &font) {


@@ -601,10 +722,23 @@ void Window::SetCursor(Cursor curs) {
 
 
 void Window::SetTitle(const char *s) {
 
 
 void Window::SetTitle(const char *s) {

-    GETWIN(id)->SetTitle(stc2wx(s));
+    GETWIN(id)->SetLabel(stc2wx(s));

 }
 
 
 }
 
 

+// Returns rectangle of monitor pt is on
+PRectangle Window::GetMonitorRect(Point pt) {
+    wxRect rect;
+    if (! id) 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();
+#endif
+    return PRectangleFromwxRect(rect);
+}
+

 //----------------------------------------------------------------------
 // Helper classes for ListBox
 
 //----------------------------------------------------------------------
 // Helper classes for ListBox
 


@@ -666,8 +800,8 @@ END_EVENT_TABLE()
 
 
 
 
 
 

-#if wxUSE_POPUPWIN //-----------------------------------   
-#include <wx/popupwin.h>
+#if wxUSE_POPUPWIN //-----------------------------------
+#include "wx/popupwin.h"

 
 
 //
 
 
 //


@@ -676,9 +810,9 @@ END_EVENT_TABLE()
 // implement wxPopupWindow for the Mac!!)
 //
 // In the meantime, be careful to duplicate any changes as needed...
 // implement wxPopupWindow for the Mac!!)
 //
 // In the meantime, be careful to duplicate any changes as needed...

-//    
-    
-// A popup window to place the wxSTCListBox upon    
+//
+
+// A popup window to place the wxSTCListBox upon

 class wxSTCListBoxWin : public wxPopupWindow
 {
 private:
 class wxSTCListBoxWin : public wxPopupWindow
 {
 private:


@@ -686,12 +820,13 @@ private:
     CallBackAction      doubleClickAction;
     void*               doubleClickActionData;
 public:
     CallBackAction      doubleClickAction;
     void*               doubleClickActionData;
 public:

-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id) :
+    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :

         wxPopupWindow(parent, wxBORDER_NONE)
     {
         wxPopupWindow(parent, wxBORDER_NONE)
     {

+

         SetBackgroundColour(*wxBLACK);  // for our simple border
 
         SetBackgroundColour(*wxBLACK);  // for our simple border
 

-        lv = new wxSTCListBox(parent, id, wxDefaultPosition, wxDefaultSize,
+        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);
                               wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxBORDER_NONE);
         lv->SetCursor(wxCursor(wxCURSOR_ARROW));
         lv->InsertColumn(0, wxEmptyString);


@@ -702,7 +837,7 @@ public:
         // "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
         // "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. 
+        // then reparent it back to the popup.

         lv->SetFocus();
         lv->Reparent(this);
 #ifdef __WXMSW__
         lv->SetFocus();
         lv->Reparent(this);
 #ifdef __WXMSW__


@@ -793,19 +928,30 @@ BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow)
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 

-    

 
 

-#else // wxUSE_POPUPWIN -----------------------------------

 
 

-// A normal window to place the wxSTCListBox upon.
-class wxSTCListBoxWin : public wxWindow {
+#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:
 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,


@@ -826,7 +972,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...


@@ -841,7 +988,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;


@@ -852,18 +1000,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);


@@ -874,15 +1026,44 @@ public:
         event.Skip();
     }
 
         event.Skip();
     }
 

+    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__
 #ifdef __WXMAC__

-    virtual bool Show(bool show = true) {
-        bool rv = wxWindow::Show(show);

         GetParent()->Refresh(false);
         GetParent()->Refresh(false);

+#endif

         return rv;
     }
         return rv;
     }

-#endif
-    
-    void OnActivate(wxListEvent& WXUNUSED(event)) {
+
+    void OnActivate(wxListEvent& WXUNUSED(event))
+    {

         doubleClickAction(doubleClickActionData);
     }
 
         doubleClickAction(doubleClickActionData);
     }
 


@@ -918,7 +1099,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;
 


@@ -927,13 +1109,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();


@@ -942,7 +1126,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);

 };
 
 
 };
 
 


@@ -970,11 +1154,12 @@ void ListBoxImpl::SetFont(Font &font) {
 }
 
 
 }
 
 

-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);
+    id = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID, location);

     if (imgList != NULL)
         GETLB(id)->SetImageList(imgList, wxIMAGE_LIST_SMALL);
 }
     if (imgList != NULL)
         GETLB(id)->SetImageList(imgList, wxIMAGE_LIST_SMALL);
 }


@@ -990,10 +1175,14 @@ 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
     int maxh ;
 
     // give it a default if there are no lines, and/or add a bit more


@@ -1039,18 +1228,37 @@ void ListBoxImpl::Clear() {
 
 
 void ListBoxImpl::Append(char *s, int type) {
 
 
 void ListBoxImpl::Append(char *s, int type) {

-    wxString text = stc2wx(s);
+    Append(stc2wx(s), type);
+}
+
+void ListBoxImpl::Append(const wxString& text, int type) {

     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);

+    long idx = -1;

     GETLB(id)->SetItem(itemID, 1, text);
     GETLB(id)->SetItem(itemID, 1, text);

-    int itemWidth = 0;
-    GETLB(id)->GetTextExtent(text, &itemWidth, NULL);
-    maxStrWidth = wxMax(maxStrWidth, itemWidth);
+    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(id)->SetItemImage(itemID, idx, idx);
+}
+
+void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
+    GETLB(id)->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(id)->Thaw();

 }
 
 
 }
 
 


@@ -1065,7 +1273,7 @@ void ListBoxImpl::Select(int n) {
         n = 0;
         select = false;
     }
         n = 0;
         select = false;
     }

-    GETLB(id)->Focus(n);
+    GETLB(id)->EnsureVisible(n);

     GETLB(id)->Select(n, select);
 }
 
     GETLB(id)->Select(n, select);
 }
 


@@ -1133,7 +1341,6 @@ void ListBoxImpl::SetDoubleClickAction(CallBackAction action, void *data) {
 }
 
 
 }
 
 

-

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


@@ -1203,9 +1410,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.


@@ -1226,7 +1430,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);

 }
 
 
 }
 
 


@@ -1246,7 +1450,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


@@ -1256,6 +1468,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
 }
 


@@ -1269,6 +1483,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) {


@@ -1276,18 +1491,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

 }
 
 
 }
 
 


@@ -1316,11 +1529,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;
 }


@@ -1340,10 +1562,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);
 }
 


@@ -1362,7 +1584,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!!
 


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

-
-
-
-
-
+#endif // wxUSE_STC