Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update from suzumizaki (patch 1522506)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-25 00:26:01 +00:00
parent 988bbabbaa
commit 74e1efddbc
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/src/stc/PlatWX.cpp
View File

@@ -1330,9 +1330,6 @@ unsigned int Platform::DoubleClickTime() {
bool Platform::MouseButtonBounce() { bool Platform::MouseButtonBounce() {
return false; return false;
} }
void Platform::DebugDisplay(const char *s) {
wxLogDebug(stc2wx(s));
}
bool Platform::IsKeyDown(int WXUNUSED(key)) { bool Platform::IsKeyDown(int WXUNUSED(key)) {
return false; // I don't think we'll need this. return false; // I don't think we'll need this.
@@ -1373,7 +1370,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, ...) { void Platform::DebugPrintf(const char *format, ...) {
#ifdef TRACE #ifdef TRACE
@@ -1396,6 +1401,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]; char buffer[2000];
sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line); sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
if (assertionPopUps) { if (assertionPopUps) {
@@ -1403,18 +1409,16 @@ void Platform::Assert(const char *c, const char *file, int line) {
wxMessageBox(stc2wx(buffer), wxMessageBox(stc2wx(buffer),
wxT("Assertion failure"), wxT("Assertion failure"),
wxICON_HAND | wxOK); wxICON_HAND | wxOK);
// if (idButton == IDRETRY) {
// ::DebugBreak();
// } else if (idButton == IDIGNORE) {
// // all OK
// } else {
// abort();
// }
} else { } else {
strcat(buffer, "\r\n"); strcat(buffer, "\r\n");
Platform::DebugDisplay(buffer); Platform::DebugDisplay(buffer);
abort(); abort();
} }
#else
wxUnusedVar(c);
wxUnusedVar(file);
wxUnusedVar(line);
#endif
} }

26
src/stc/PlatWX.cpp
View File

@@ -1330,9 +1330,6 @@ unsigned int Platform::DoubleClickTime() {
bool Platform::MouseButtonBounce() { bool Platform::MouseButtonBounce() {
return false; return false;
} }
void Platform::DebugDisplay(const char *s) {
wxLogDebug(stc2wx(s));
}
bool Platform::IsKeyDown(int WXUNUSED(key)) { bool Platform::IsKeyDown(int WXUNUSED(key)) {
return false; // I don't think we'll need this. return false; // I don't think we'll need this.
@@ -1373,7 +1370,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, ...) { void Platform::DebugPrintf(const char *format, ...) {
#ifdef TRACE #ifdef TRACE
@@ -1396,6 +1401,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]; char buffer[2000];
sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line); sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
if (assertionPopUps) { if (assertionPopUps) {
@@ -1403,18 +1409,16 @@ void Platform::Assert(const char *c, const char *file, int line) {
wxMessageBox(stc2wx(buffer), wxMessageBox(stc2wx(buffer),
wxT("Assertion failure"), wxT("Assertion failure"),
wxICON_HAND | wxOK); wxICON_HAND | wxOK);
// if (idButton == IDRETRY) {
// ::DebugBreak();
// } else if (idButton == IDIGNORE) {
// // all OK
// } else {
// abort();
// }
} else { } else {
strcat(buffer, "\r\n"); strcat(buffer, "\r\n");
Platform::DebugDisplay(buffer); Platform::DebugDisplay(buffer);
abort(); abort();
} }
#else
wxUnusedVar(c);
wxUnusedVar(file);
wxUnusedVar(line);
#endif
} }