moved wxUniv-specific GUI stuff from wxBase to wxCore; this fixes wxUniv DLL build

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index eefe29c5c971788a5c5a625f21b68e588eaeb2c7..4d111eaf539c29e004758317ab38f94b1410e9fb 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -54,6 +54,10 @@
 #include "wx/process.h"
 #include "wx/txtstrm.h"
 
 #include "wx/process.h"
 #include "wx/txtstrm.h"
 

+#if defined(__WXWINCE__) && wxUSE_DATETIME
+#include "wx/datetime.h"
+#endif
+

 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -73,17 +77,17 @@
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 

+#ifndef __WXWINCE__

 #include <time.h>
 #include <time.h>

+#else
+#include "wx/msw/wince/time.h"
+#endif

 
 

-#ifndef __MWERKS__
+#if !defined(__MWERKS__) && !defined(__WXWINCE__)

     #include <sys/types.h>
     #include <sys/stat.h>
 #endif
 
     #include <sys/types.h>
     #include <sys/stat.h>
 #endif
 

-#ifdef __SALFORDC__
-    #include <clib.h>
-#endif
-

 #ifdef __WXMSW__
     #include "wx/msw/private.h"
 #endif
 #ifdef __WXMSW__
     #include "wx/msw/private.h"
 #endif


@@ -119,25 +123,6 @@ copystring (const wxChar *s)
 
 #endif // WXWIN_COMPATIBILITY_2_4
 
 
 #endif // WXWIN_COMPATIBILITY_2_4
 

-// Id generation
-static long wxCurrentId = 100;
-
-long
-wxNewId (void)
-{
-  return wxCurrentId++;
-}
-
-long
-wxGetCurrentId(void) { return wxCurrentId; }
-
-void
-wxRegisterId (long id)
-{
-  if (id >= wxCurrentId)
-    wxCurrentId = id + 1;
-}
-

 // ----------------------------------------------------------------------------
 // String <-> Number conversions (deprecated)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // String <-> Number conversions (deprecated)
 // ----------------------------------------------------------------------------


@@ -259,10 +244,19 @@ wxString wxDecToHex(int dec)
 // Return the current date/time
 wxString wxNow()
 {
 // Return the current date/time
 wxString wxNow()
 {

+#ifdef __WXWINCE__
+#if wxUSE_DATETIME
+    wxDateTime now = wxDateTime::Now();
+    return now.Format();
+#else
+    return wxEmptyString;
+#endif
+#else

     time_t now = time((time_t *) NULL);
     char *date = ctime(&now);
     date[24] = '\0';
     return wxString::FromAscii(date);
     time_t now = time((time_t *) NULL);
     char *date = ctime(&now);
     date[24] = '\0';
     return wxString::FromAscii(date);

+#endif

 }
 
 const wxChar *wxGetInstallPrefix()
 }
 
 const wxChar *wxGetInstallPrefix()


@@ -299,7 +293,12 @@ int wxGetOsVersion(int *verMaj, int *verMin)
     if ( ! traits )
         traits = &traitsConsole;
 
     if ( ! traits )
         traits = &traitsConsole;
 

-    return traits->GetOSVersion(verMaj, verMin);
+    wxToolkitInfo& info = traits->GetToolkitInfo();
+    if ( verMaj )
+        *verMaj = info.versionMajor;
+    if ( verMin )
+        *verMin = info.versionMinor;
+    return info.os;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -341,8 +340,7 @@ wxString wxGetUserId()
     static const int maxLoginLen = 256; // FIXME arbitrary number
 
     wxString buf;
     static const int maxLoginLen = 256; // FIXME arbitrary number
 
     wxString buf;

-    bool ok = wxGetUserId(buf.GetWriteBuf(maxLoginLen), maxLoginLen);
-    buf.UngetWriteBuf();
+    bool ok = wxGetUserId(wxStringBuffer(buf, maxLoginLen), maxLoginLen);

 
     if ( !ok )
         buf.Empty();
 
     if ( !ok )
         buf.Empty();


@@ -355,8 +353,7 @@ wxString wxGetUserName()
     static const int maxUserNameLen = 1024; // FIXME arbitrary number
 
     wxString buf;
     static const int maxUserNameLen = 1024; // FIXME arbitrary number
 
     wxString buf;

-    bool ok = wxGetUserName(buf.GetWriteBuf(maxUserNameLen), maxUserNameLen);
-    buf.UngetWriteBuf();
+    bool ok = wxGetUserName(wxStringBuffer(buf, maxUserNameLen), maxUserNameLen);

 
     if ( !ok )
         buf.Empty();
 
     if ( !ok )
         buf.Empty();


@@ -369,9 +366,7 @@ wxString wxGetHostName()
     static const size_t hostnameSize = 257;
 
     wxString buf;
     static const size_t hostnameSize = 257;
 
     wxString buf;

-    bool ok = wxGetHostName(buf.GetWriteBuf(hostnameSize), hostnameSize);
-
-    buf.UngetWriteBuf();
+    bool ok = wxGetHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);

 
     if ( !ok )
         buf.Empty();
 
     if ( !ok )
         buf.Empty();


@@ -384,9 +379,7 @@ wxString wxGetFullHostName()
     static const size_t hostnameSize = 257;
 
     wxString buf;
     static const size_t hostnameSize = 257;
 
     wxString buf;

-    bool ok = wxGetFullHostName(buf.GetWriteBuf(hostnameSize), hostnameSize);
-
-    buf.UngetWriteBuf();
+    bool ok = wxGetFullHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);

 
     if ( !ok )
         buf.Empty();
 
     if ( !ok )
         buf.Empty();


@@ -541,6 +534,25 @@ bool wxYieldIfNeeded()
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+// Id generation
+static long wxCurrentId = 100;
+
+long
+wxNewId (void)
+{
+  return wxCurrentId++;
+}
+
+long
+wxGetCurrentId(void) { return wxCurrentId; }
+
+void
+wxRegisterId (long id)
+{
+  if (id >= wxCurrentId)
+    wxCurrentId = id + 1;
+}
+

 #if wxUSE_MENUS
 
 // ----------------------------------------------------------------------------
 #if wxUSE_MENUS
 
 // ----------------------------------------------------------------------------