projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes to dependency problems in win32 makefiles
[wxWidgets.git]
/
contrib
/
src
/
stc
/
PlatWX.cpp
diff --git
a/contrib/src/stc/PlatWX.cpp
b/contrib/src/stc/PlatWX.cpp
index bcb44e5bc34d39b20b503c08721a019df861af86..98eba98548317d43d6aa1262842000d73456684b 100644
(file)
--- a/
contrib/src/stc/PlatWX.cpp
+++ b/
contrib/src/stc/PlatWX.cpp
@@
-481,7
+481,7
@@
void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
// so figure it out and fix it!
i = 0;
size_t ui = 0;
// so figure it out and fix it!
i = 0;
size_t ui = 0;
- while (i < len) {
+ while (
(int)
i < len) {
unsigned char uch = (unsigned char)s[i];
positions[i++] = tpos[ui];
if (uch >= 0x80) {
unsigned char uch = (unsigned char)s[i];
positions[i++] = tpos[ui];
if (uch >= 0x80) {
@@
-1062,6
+1062,13
@@
void Menu::Show(Point pt, Window &w) {
//----------------------------------------------------------------------
//----------------------------------------------------------------------
+DynamicLibrary *DynamicLibrary::Load(const char *modulePath) {
+ wxFAIL_MSG(wxT("Dynamic lexer loading not implemented yet"));
+ return NULL;
+}
+
+//----------------------------------------------------------------------
+
ColourDesired Platform::Chrome() {
wxColour c;
c = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
ColourDesired Platform::Chrome() {
wxColour c;
c = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
@@
-1216,6
+1223,22
@@
double ElapsedTime::Duration(bool reset) {
//----------------------------------------------------------------------
//----------------------------------------------------------------------
+#if wxUSE_UNICODE
+wxString stc2wx(const char* str, size_t len)
+{
+ char *buffer=new char[len+1];
+ strncpy(buffer, str, len);
+ buffer[len]=0;
+
+ wxString cstr(buffer, wxConvUTF8);
+
+ delete[] buffer;
+ return cstr;
+}
+#endif
+
+
+