Update the text part of combobox when changing text of selected item in wxGTK.

[wxWidgets.git] / src / common / time.cpp

diff --git a/src/common/time.cpp b/src/common/time.cpp
index ff163db0cc2d575a059f26e651e29326f7118f48..ebc597d969f17713d4cb13aa36f011cbaa2ce3b7 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -26,7 +26,7 @@
 #include "wx/time.h"
 
 #ifndef WX_PRECOMP
 #include "wx/time.h"
 
 #ifndef WX_PRECOMP

-    #ifdef __WXMSW__
+    #ifdef __WINDOWS__

         #include "wx/msw/wrapwin.h"
     #endif
     #include "wx/intl.h"
         #include "wx/msw/wrapwin.h"
     #endif
     #include "wx/intl.h"


@@ -48,7 +48,7 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

-#if defined(__MWERKS__) && defined(__WXMSW__)
+#if defined(__MWERKS__) && defined(__WINDOWS__)

 #   undef HAVE_FTIME
 #   undef HAVE_GETTIMEOFDAY
 #endif
 #   undef HAVE_FTIME
 #   undef HAVE_GETTIMEOFDAY
 #endif


@@ -274,7 +274,7 @@ long wxGetUTCTime()
 
 wxLongLong wxGetUTCTimeUSec()
 {
 
 wxLongLong wxGetUTCTimeUSec()
 {

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

     FILETIME ft;
     ::GetSystemTimeAsFileTime(&ft);
 
     FILETIME ft;
     ::GetSystemTimeAsFileTime(&ft);
 


@@ -309,7 +309,7 @@ wxLongLong wxGetUTCTimeMillis()
 
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

     FILETIME ft;
     ::GetSystemTimeAsFileTime(&ft);
 
     FILETIME ft;
     ::GetSystemTimeAsFileTime(&ft);