Include wx/dialog.h according to precompiled headers of wx/wx.h (with other minor...

[wxWidgets.git] / contrib / src / stc / PlatWX.cpp

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 7b406629011a59541c2808f34ed4f32f8f8ff0a5..f0d9d17603c195acc2aaa946089d03f652c2c40e 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -919,7 +919,7 @@ private:
     bool                unicodeMode;
     int                 desiredVisibleRows;
     int                 aveCharWidth;
     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;
     Point               location;       // Caret location at which the list is opened
     wxImageList*        imgList;
     wxArrayInt*         imgTypeMap;


@@ -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;
 }