// Scintilla source code edit control
-// PlatWX.cxx - implementation of platform facilities on wxWindows
+// PlatWX.cxx - implementation of platform facilities on wxWidgets
// Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
// Robin Dunn <robin@aldunn.com>
// The License.txt file describes the conditions under which this software may be distributed.
#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>
+#include "wx/wx.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"
#include "Platform.h"
#include "PlatWX.h"
#include "wx/stc/stc.h"
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
-
Point Point::FromLong(long lpoint) {
return Point(lpoint & 0xFFFF, lpoint >> 16);
}
wxRect wxRectFromPRectangle(PRectangle prc) {
- wxRect rc(prc.left, prc.top,
- prc.right-prc.left, prc.bottom-prc.top);
- return rc;
+ wxRect r(prc.left, prc.top,
+ prc.Width(), prc.Height());
+ return r;
}
PRectangle PRectangleFromwxRect(wxRect rc) {
wxColour wxColourFromCA(const ColourAllocated& ca) {
ColourDesired cd(ca.AsLong());
- return wxColour(cd.GetRed(), cd.GetGreen(), cd.GetBlue());
+ return wxColour((unsigned char)cd.GetRed(),
+ (unsigned char)cd.GetGreen(),
+ (unsigned char)cd.GetBlue());
}
//----------------------------------------------------------------------
Font::~Font() {
}
-void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic) {
- wxFontEncoding encoding;
+void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag) {
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())
encoding = ea[0];
- id = new wxFont(size,
+ wxFont* font = new wxFont(size,
wxDEFAULT,
italic ? wxITALIC : wxNORMAL,
bold ? wxBOLD : wxNORMAL,
false,
stc2wx(faceName),
encoding);
+ font->SetNoAntiAliasing(!extraFontFlag);
+ id = font;
}
void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) {
- wxString str = stc2wx(s, len);
- SetFont(font);
+ wxString str = stc2wx(s, len);
+ wxArrayInt tpos;
-#ifndef __WXMAC__
- // Calculate the position of each character based on the widths of
- // the previous characters
- int* tpos = new int[len+1];
- int totalWidth = 0;
- size_t i;
- for (i=0; i<str.Length(); i++) {
- int w, h;
- hdc->GetTextExtent(str[i], &w, &h);
- totalWidth += w;
- tpos[i] = totalWidth;
- }
-#else
- // Instead of a running total, remeasure from the begining of the
- // text for each character's position. This is because with AA fonts
- // on OS X widths can be fractions of pixels wide when more than one
- // are drawn together, so the sum of all character widths is not necessarily
- // (and probably not) the same as the whole string width.
- int* tpos = new int[len+1];
- size_t i;
- for (i=0; i<str.Length(); i++) {
- int w, h;
- hdc->GetTextExtent(str.Left(i+1), &w, &h);
- tpos[i] = w;
- }
-#endif
+ SetFont(font);
+ hdc->GetPartialTextExtents(str, tpos);
#if wxUSE_UNICODE
// Map the widths for UCS-2 characters back to the UTF-8 input string
// NOTE: I don't think this is right for when sizeof(wxChar) > 2, ie wxGTK2
// so figure it out and fix it!
- i = 0;
+ size_t i = 0;
size_t ui = 0;
while ((int)i < len) {
unsigned char uch = (unsigned char)s[i];
#else
// If not unicode then just use the widths we have
- memcpy(positions, tpos, len * sizeof(*tpos));
+#if wxUSE_STL
+ std::copy(tpos.begin(), tpos.end(), positions);
+#else
+ memcpy(positions, tpos.begin(), len * sizeof(int));
+#endif
#endif
-
- delete [] tpos;
}
int SurfaceImpl::Height(Font &font) {
SetFont(font);
- return hdc->GetCharHeight();
+ return hdc->GetCharHeight() + 1;
}
int SurfaceImpl::AverageCharWidth(Font &font) {
void Window::Destroy() {
if (id) {
- Show(FALSE);
+ Show(false);
GETWIN(id)->Destroy();
}
id = 0;
void Window::InvalidateAll() {
GETWIN(id)->Refresh(false);
- wxWakeUpIdle();
}
void Window::InvalidateRectangle(PRectangle rc) {
wxRect r = wxRectFromPRectangle(rc);
GETWIN(id)->Refresh(false, &r);
- wxWakeUpIdle();
}
void Window::SetFont(Font &font) {
#else
wxCursor wc = wxCursor(cursorId) ;
#endif
- GETWIN(id)->SetCursor(wc);
+ if(curs != cursorLast)
+ {
+ GETWIN(id)->SetCursor(wc);
+ cursorLast = curs;
+ }
}
void Window::SetTitle(const char *s) {
- GETWIN(id)->SetTitle(stc2wx(s));
+ GETWIN(id)->SetLabel(stc2wx(s));
}
wxSTCListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style)
- : wxListView(parent, id, pos, size, style)
- {}
+ : wxListView()
+ {
+#ifdef __WXMSW__
+ Hide(); // don't flicker as we move it around...
+#endif
+ Create(parent, id, pos, size, style);
+ }
+
void OnFocus(wxFocusEvent& event) {
GetParent()->SetFocus();
event.Skip();
}
- void OnKillFocus(wxFocusEvent& event) {
+ void OnKillFocus(wxFocusEvent& WXUNUSED(event)) {
// Do nothing. Prevents base class from resetting the colors...
}
+#ifdef __WXMAC__
+ // For some reason I don't understand yet the focus doesn't really leave
+ // the listbox like it should, so if we get any events feed them back to
+ // the wxSTC
+ void OnKeyDown(wxKeyEvent& event) {
+ GetGrandParent()->GetEventHandler()->ProcessEvent(event);
+ }
+ void OnChar(wxKeyEvent& event) {
+ GetGrandParent()->GetEventHandler()->ProcessEvent(event);
+ }
+
+ // And we need to force the focus back when being destroyed
+ ~wxSTCListBox() {
+ GetGrandParent()->SetFocus();
+ }
+#endif
+
private:
DECLARE_EVENT_TABLE()
};
BEGIN_EVENT_TABLE(wxSTCListBox, wxListView)
EVT_SET_FOCUS( wxSTCListBox::OnFocus)
EVT_KILL_FOCUS(wxSTCListBox::OnKillFocus)
+#ifdef __WXMAC__
+ EVT_KEY_DOWN( wxSTCListBox::OnKeyDown)
+ EVT_CHAR( wxSTCListBox::OnChar)
+#endif
END_EVENT_TABLE()
+#if wxUSE_POPUPWIN //-----------------------------------
+#include <wx/popupwin.h>
+
+
+//
+// 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
+{
+private:
+ wxListView* lv;
+ CallBackAction doubleClickAction;
+ void* doubleClickActionData;
+public:
+ wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
+ wxPopupWindow(parent, wxBORDER_NONE)
+ {
+ SetBackgroundColour(*wxBLACK); // for our simple border
+
+ lv = new wxSTCListBox(parent, id, wxDefaultPosition, 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
+ }
-// A window to place the wxSTCListBox upon
+
+ // 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
+ wxSize sz = GetSize();
+ sz.x -= 2;
+ sz.y -= 2;
+ lv->SetSize(1, 1, 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 -----------------------------------
+
+// A normal window to place the wxSTCListBox upon.
class wxSTCListBoxWin : public wxWindow {
private:
wxListView* lv;
CallBackAction doubleClickAction;
void* doubleClickActionData;
public:
- wxSTCListBoxWin(wxWindow* parent, wxWindowID id) :
- wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxNO_BORDER )
+ wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point location) :
+ wxWindow(parent, id, wxPoint(location.x, location.y), wxSize(0,0), wxSIMPLE_BORDER )
{
- SetBackgroundColour(*wxBLACK);
lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
lv->SetCursor(wxCursor(wxCURSOR_ARROW));
// things to look right...
lv->SetFocus();
+ Hide();
+ }
+
+
// On OSX and (possibly others) there can still be pending
// messages/events for the list control when Scintilla wants to
// close it, so do a pending delete of it instead of destroying
// immediately.
bool Destroy() {
+#ifdef __WXMAC__
+ // The bottom edge of this window is not getting properly
+ // refreshed upon deletion, so help it out...
+ wxWindow* p = GetParent();
+ wxRect r(GetPosition(), GetSize());
+ r.SetHeight(r.GetHeight()+1);
+ p->Refresh(false, &r);
+#endif
if ( !wxPendingDelete.Member(this) )
wxPendingDelete.Append(this);
- return TRUE;
+ return true;
}
-
+
int IconWidth() {
wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
if (il != NULL) {
}
void OnSize(wxSizeEvent& event) {
- // resize the child, leaving a 1 pixel border
+ // resize the child
wxSize sz = GetClientSize();
- lv->SetSize(1, 1, sz.x-2, sz.y-2);
+ lv->SetSize(sz);
// reset the column widths
lv->SetColumnWidth(0, IconWidth()+4);
lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -
event.Skip();
}
- void OnActivate(wxListEvent& event) {
+#ifdef __WXMAC__
+ virtual bool Show(bool show = true) {
+ bool rv = wxWindow::Show(show);
+ GetParent()->Refresh(false);
+ return rv;
+ }
+#endif
+
+ void OnActivate(wxListEvent& WXUNUSED(event)) {
doubleClickAction(doubleClickActionData);
}
BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow)
- EVT_SET_FOCUS ( wxSTCListBoxWin::OnFocus)
- EVT_SIZE ( wxSTCListBoxWin::OnSize)
- EVT_LIST_ITEM_ACTIVATED(-1, wxSTCListBoxWin::OnActivate)
+ EVT_SET_FOCUS ( wxSTCListBoxWin::OnFocus)
+ EVT_SIZE ( wxSTCListBoxWin::OnSize)
+ EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
END_EVENT_TABLE()
+#endif // wxUSE_POPUPWIN -----------------------------------
inline wxSTCListBoxWin* GETLBW(WindowID win) {
bool unicodeMode;
int desiredVisibleRows;
int aveCharWidth;
- int maxStrWidth;
+ size_t maxStrWidth;
+ Point location; // Caret location at which the list is opened
wxImageList* imgList;
wxArrayInt* imgTypeMap;
~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 int GetVisibleRows() const;
virtual PRectangle GetDesiredRect();
virtual int CaretFromEdge();
virtual void Clear();
virtual void Append(char *s, int type = -1);
+ void Append(const wxString& text, int type);
virtual int Length();
virtual void Select(int n);
virtual int GetSelection();
virtual int Find(const char *prefix);
virtual void GetValue(int n, char *value, int len);
- virtual void Sort();
virtual void RegisterImage(int type, const char *xpm_data);
virtual void ClearRegisteredImages();
virtual void SetDoubleClickAction(CallBackAction, void *);
-
+ virtual void SetList(const char* list, char separator, char typesep);
};
}
-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;
- 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);
}
}
+int ListBoxImpl::GetVisibleRows() const {
+ return desiredVisibleRows;
+}
+
PRectangle ListBoxImpl::GetDesiredRect() {
// wxListCtrl doesn't have a DoGetBestSize, so instead we kept track of
// the max size in Append and calculate it here...
- int maxw = maxStrWidth;
+ int maxw = maxStrWidth * aveCharWidth;
int maxh ;
// give it a default if there are no lines, and/or add a bit more
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);
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"));
long idx = imgTypeMap->Item(type);
}
}
+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();
+}
+
int ListBoxImpl::Length() {
return GETLB(id)->GetItemCount();
void ListBoxImpl::Select(int n) {
- bool select = TRUE;
+ bool select = true;
if (n == -1) {
n = 0;
- select = FALSE;
+ select = false;
}
GETLB(id)->Focus(n);
GETLB(id)->Select(n, select);
int ListBoxImpl::Find(const char *WXUNUSED(prefix)) {
// No longer used
- return -1;
+ return wxNOT_FOUND;
}
value[len-1] = '\0';
}
-void ListBoxImpl::Sort() {
-}
-
void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
- wxBitmap bmp(wxImage(stream, wxBITMAP_TYPE_XPM));
+ wxImage img(stream, wxBITMAP_TYPE_XPM);
+ wxBitmap bmp(img);
if (! imgList) {
// assumes all images are the same size
- imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), TRUE);
+ imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), true);
imgTypeMap = new wxArrayInt;
}
}
-
ListBox::ListBox() {
}
}
bool Platform::MouseButtonBounce() {
- return FALSE;
+ return false;
}
void Platform::DebugDisplay(const char *s) {
wxLogDebug(stc2wx(s));
static bool assertionPopUps = true;
bool Platform::ShowAssertionPopUps(bool assertionPopUps_) {
- bool ret = assertionPopUps;
- assertionPopUps = assertionPopUps_;
- return ret;
+ bool ret = assertionPopUps;
+ assertionPopUps = assertionPopUps_;
+ return ret;
}
void Platform::Assert(const char *c, const char *file, int line) {
- char buffer[2000];
- sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
- if (assertionPopUps) {
- /*int idButton = */
- wxMessageBox(stc2wx(buffer),
- wxT("Assertion failure"),
- wxICON_HAND | wxOK);
-// if (idButton == IDRETRY) {
-// ::DebugBreak();
-// } else if (idButton == IDIGNORE) {
-// // all OK
-// } else {
-// abort();
-// }
- } else {
- strcat(buffer, "\r\n");
- Platform::DebugDisplay(buffer);
- abort();
- }
+ char buffer[2000];
+ sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
+ if (assertionPopUps) {
+ /*int idButton = */
+ wxMessageBox(stc2wx(buffer),
+ wxT("Assertion failure"),
+ wxICON_HAND | wxOK);
+// if (idButton == IDRETRY) {
+// ::DebugBreak();
+// } else if (idButton == IDIGNORE) {
+// // all OK
+// } else {
+// abort();
+// }
+ } else {
+ strcat(buffer, "\r\n");
+ Platform::DebugDisplay(buffer);
+ abort();
+ }
}
//----------------------------------------------------------------------
ElapsedTime::ElapsedTime() {
- wxStartTimer();
+ wxLongLong localTime = wxGetLocalTimeMillis();
+ littleBit = localTime.GetLo();
+ bigBit = localTime.GetHi();
}
double ElapsedTime::Duration(bool reset) {
- double result = wxGetElapsedTime(reset);
+ wxLongLong prevTime(bigBit, littleBit);
+ wxLongLong localTime = wxGetLocalTimeMillis();
+ if(reset) {
+ littleBit = localTime.GetLo();
+ bigBit = localTime.GetHi();
+ }
+ wxLongLong duration = localTime - prevTime;
+ double result = duration.ToDouble();
result /= 1000.0;
return result;
}
//----------------------------------------------------------------------
#if wxUSE_UNICODE
+
+#include "UniConversion.h"
+
+// Convert using Scintilla's functions instead of wx's, Scintilla's are more
+// forgiving and won't assert...
+
wxString stc2wx(const char* str, size_t len)
{
- char *buffer=new char[len+1];
- strncpy(buffer, str, len);
- buffer[len]=0;
+ if (!len)
+ return wxEmptyString;
- wxString cstr(buffer, wxConvUTF8);
+ size_t wclen = UCS2Length(str, len);
+ wxWCharBuffer buffer(wclen+1);
- delete[] buffer;
- return cstr;
+ size_t actualLen = UCS2FromUTF8(str, len, buffer.data(), wclen+1);
+ return wxString(buffer.data(), actualLen);
}
-#endif
+wxString stc2wx(const char* str)
+{
+ return stc2wx(str, strlen(str));
+}
+const wxWX2MBbuf wx2stc(const wxString& str)
+{
+ const wchar_t* wcstr = str.c_str();
+ size_t wclen = str.length();
+ size_t len = UTF8Length(wcstr, wclen);
+
+ wxCharBuffer buffer(len+1);
+ UTF8FromUCS2(wcstr, wclen, buffer.data(), len);
+ // TODO check NULL termination!!
+
+ return buffer;
+}
+
+#endif
projects / wxWidgets.git / blobdiff