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

Deprecated and obsolete parts marked up for backward compatibility.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-14 19:54:51 +00:00
parent 89831b54e6
commit 1d94e268dd
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/deprecated/resource.cpp
View File

@@ -2225,7 +2225,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
{ wxT("wxSYSTEM_MENU"), wxSYSTEM_MENU}, { wxT("wxSYSTEM_MENU"), wxSYSTEM_MENU},
{ wxT("wxMINIMIZE_BOX"), wxMINIMIZE_BOX}, { wxT("wxMINIMIZE_BOX"), wxMINIMIZE_BOX},
{ wxT("wxMAXIMIZE_BOX"), wxMAXIMIZE_BOX}, { wxT("wxMAXIMIZE_BOX"), wxMAXIMIZE_BOX},
#if WXWIN_COMPATIBILITY_2_6
{ wxT("wxRESIZE_BOX"), wxRESIZE_BOX}, { wxT("wxRESIZE_BOX"), wxRESIZE_BOX},
#endif // WXWIN_COMPATIBILITY_2_6
{ wxT("wxDEFAULT_FRAME_STYLE"), wxDEFAULT_FRAME_STYLE}, { wxT("wxDEFAULT_FRAME_STYLE"), wxDEFAULT_FRAME_STYLE},
{ wxT("wxDEFAULT_FRAME"), wxDEFAULT_FRAME_STYLE}, { wxT("wxDEFAULT_FRAME"), wxDEFAULT_FRAME_STYLE},
{ wxT("wxDEFAULT_DIALOG_STYLE"), wxDEFAULT_DIALOG_STYLE}, { wxT("wxDEFAULT_DIALOG_STYLE"), wxDEFAULT_DIALOG_STYLE},

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

@@ -1342,11 +1342,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; result /= 1000.0;
return result; return result;
} }

13
src/stc/PlatWX.cpp
View File

@@ -1342,11 +1342,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; result /= 1000.0;
return result; return result;
} }