projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced ostream with FILE* in wxExpr.
[wxWidgets.git]
/
include
/
wx
/
defs.h
diff --git
a/include/wx/defs.h
b/include/wx/defs.h
index 7ed90835ba741cfe97310f72fb69150e2fcb7e73..a61061304a34aa06974a001b5fa8a985882433b5 100644
(file)
--- a/
include/wx/defs.h
+++ b/
include/wx/defs.h
@@
-411,18
+411,10
@@
typedef int unsigned wxUint32;
#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
#if defined(SIZEOF_INT)
#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
#if defined(SIZEOF_INT)
- #if (SIZEOF_SHORT == 2)
typedef short signed wxInt16;
typedef short unsigned wxUint16;
typedef short signed wxInt16;
typedef short unsigned wxUint16;
- #else
- #error "FIXME"
- #endif
- #if (SIZEOF_INT == 4)
typedef int signed wxInt32;
typedef int unsigned wxUint32;
typedef int signed wxInt32;
typedef int unsigned wxUint32;
- #else
- #error "FIXME"
- #endif
#else
typedef short signed wxInt16;
typedef short unsigned wxUint16;
#else
typedef short signed wxInt16;
typedef short unsigned wxUint16;
@@
-822,6
+814,9
@@
enum wxOrientation
#define wxPD_CAN_ABORT 0x0001
#define wxPD_APP_MODAL 0x0002
#define wxPD_AUTO_HIDE 0x0004
#define wxPD_CAN_ABORT 0x0001
#define wxPD_APP_MODAL 0x0002
#define wxPD_AUTO_HIDE 0x0004
+#define wxPD_ELAPSED_TIME 0x0008
+#define wxPD_ESTIMATED_TIME 0x0010
+#define wxPD_REMAINING_TIME 0x0020
/*
* GDI descriptions
/*
* GDI descriptions
@@
-933,7
+928,7
@@
typedef enum
#define wxICON_STOP wxICON_HAND
#define wxICON_ASTERISK wxICON_INFORMATION
#define wxICON_STOP wxICON_HAND
#define wxICON_ASTERISK wxICON_INFORMATION
-#define wxICON_MASK (0x00
20|0x0040|0x0080|0x01
00)
+#define wxICON_MASK (0x00
40|0x0080|0x0100|0x02
00)
#define wxCENTRE 0x0200
#define wxCENTER wxCENTRE
#define wxCENTRE 0x0200
#define wxCENTER wxCENTRE