Implement GetDashCount() for Carbon/Cocoa.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index df2cedf59cdd9fc936817e300b60e4ff99ba5bbe..020ceade94bd6cde72098e51a1f22d0c42c0b945 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1166,8 +1166,8 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 
 
 /*  base floating point types */
 
 
 /*  base floating point types */

-/*  wxFloat32: 32 bit IEEE float ( 1 sign, 8 exponent bits, 23 fraction bits */
-/*  wxFloat64: 64 bit IEEE float ( 1 sign, 11 exponent bits, 52 fraction bits */
+/*  wxFloat32: 32 bit IEEE float ( 1 sign, 8 exponent bits, 23 fraction bits ) */
+/*  wxFloat64: 64 bit IEEE float ( 1 sign, 11 exponent bits, 52 fraction bits ) */

 /*  wxDouble: native fastest representation that has at least wxFloat64 */
 /*            precision, so use the IEEE types for storage, and this for */
 /*            calculations */
 /*  wxDouble: native fastest representation that has at least wxFloat64 */
 /*            precision, so use the IEEE types for storage, and this for */
 /*            calculations */


@@ -1839,7 +1839,7 @@ enum wxKeyType
 /*  ---------------------------------------------------------------------------- */
 
 /*  Standard menu IDs */
 /*  ---------------------------------------------------------------------------- */
 
 /*  Standard menu IDs */

-enum
+enum wxStandardID

 {
     /*
        These ids delimit the range used by automatically-generated ids
 {
     /*
        These ids delimit the range used by automatically-generated ids


@@ -2094,6 +2094,8 @@ enum wxHitTest
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 /*  Change the window position even if it seems to be already correct */
 #define wxSIZE_FORCE            0x0010
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 /*  Change the window position even if it seems to be already correct */
 #define wxSIZE_FORCE            0x0010

+/*  Emit size event even if size didn't change */
+#define wxSIZE_FORCE_EVENT      0x0020

 
 /*  ---------------------------------------------------------------------------- */
 /*  GDI descriptions */
 
 /*  ---------------------------------------------------------------------------- */
 /*  GDI descriptions */


@@ -2196,13 +2198,20 @@ enum wxDataFormatId
 /*  Virtual keycodes */
 enum wxKeyCode
 {
 /*  Virtual keycodes */
 enum wxKeyCode
 {

-    WXK_BACK    =    8,
+    WXK_BACK    =    8, // backspace

     WXK_TAB     =    9,
     WXK_RETURN  =    13,
     WXK_ESCAPE  =    27,
     WXK_TAB     =    9,
     WXK_RETURN  =    13,
     WXK_ESCAPE  =    27,

+
+    /* values from 33 to 126 are reserved for the standard ASCII characters */
+

     WXK_SPACE   =    32,
     WXK_DELETE  =    127,
 
     WXK_SPACE   =    32,
     WXK_DELETE  =    127,
 

+    /* values from 128 to 255 are reserved for ASCII extended characters
+       (note that there isn't a real widely used standard for the meaning
+       of these values; avoid them in portable apps!) */
+

     /* These are, by design, not compatible with unicode characters.
        If you want to get a unicode character from a key event, use
        wxKeyEvent::GetUnicodeKey instead.                           */
     /* These are, by design, not compatible with unicode characters.
        If you want to get a unicode character from a key event, use
        wxKeyEvent::GetUnicodeKey instead.                           */