Derive wxScrollBar from wxScrollBarBase, plus miscellaneous

[wxWidgets.git] / include / wx / longlong.h

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 83d32a77fbcfcc734ea6c446366a82a9078135f6..e2b2ea79b9f9c5bc633ea364287d2581be1d172f 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -7,7 +7,7 @@
 // Created:     10.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     10.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LONGLONG_H
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LONGLONG_H


@@ -60,7 +60,7 @@
 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64

-    #define wxLongLongFmtSpec _T("I64")
+    #define wxLongLongFmtSpec _T("Ld")

 #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
         defined(__MINGW32__) || \
         defined(__GNUC__) || \
 #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
         defined(__MINGW32__) || \
         defined(__GNUC__) || \


@@ -144,7 +144,7 @@
 // ----------------------------------------------------------------------------
 
 // we use iostream for wxLongLong output
 // ----------------------------------------------------------------------------
 
 // we use iostream for wxLongLong output

-#include "wx/ioswrap.h"
+#include "wx/iosfwrap.h"

 
 #if wxUSE_LONGLONG_NATIVE
 
 
 #if wxUSE_LONGLONG_NATIVE