Deprecated and obsolete parts marked up for backward compatibility.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 61cfa9570aeba65e9d96b6ce769540bb98e9ed73..0a567750bfe9e862b72c936b265f1e643bbcd3f3 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -2225,7 +2225,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxSYSTEM_MENU"), wxSYSTEM_MENU},
     { wxT("wxMINIMIZE_BOX"), wxMINIMIZE_BOX},
     { wxT("wxMAXIMIZE_BOX"), wxMAXIMIZE_BOX},
     { wxT("wxSYSTEM_MENU"), wxSYSTEM_MENU},
     { wxT("wxMINIMIZE_BOX"), wxMINIMIZE_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"), wxDEFAULT_FRAME_STYLE},
     { wxT("wxDEFAULT_DIALOG_STYLE"), wxDEFAULT_DIALOG_STYLE},
     { wxT("wxDEFAULT_FRAME_STYLE"), wxDEFAULT_FRAME_STYLE},
     { wxT("wxDEFAULT_FRAME"), wxDEFAULT_FRAME_STYLE},
     { wxT("wxDEFAULT_DIALOG_STYLE"), wxDEFAULT_DIALOG_STYLE},

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 6f8763df77cda0fc8364ccf119aa123bfeec463c..f0d9d17603c195acc2aaa946089d03f652c2c40e 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -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;
     return result;
 }
     result /= 1000.0;
     return result;
 }

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 6f8763df77cda0fc8364ccf119aa123bfeec463c..f0d9d17603c195acc2aaa946089d03f652c2c40e 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -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;
     return result;
 }
     result /= 1000.0;
     return result;
 }