we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 5194f0678626472bcd7966378d95df187a472349..98646a60dc47d9178b9f7c2438e429156f3d095e 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -280,12 +280,6 @@ typedef int wxWindowID;
     #define wx_static_cast(t, x) ((t)(x))
 #endif
 
     #define wx_static_cast(t, x) ((t)(x))
 #endif
 

-#ifdef HAVE_DYNAMIC_CAST
-    #define wx_dynamic_cast(t, x) dynamic_cast<t>(x)
-#else
-    #define wx_dynamic_cast(t, x) ((t)(x))
-#endif
-

 #ifdef HAVE_CONST_CAST
     #define wx_const_cast(t, x) const_cast<t>(x)
 #else
 #ifdef HAVE_CONST_CAST
     #define wx_const_cast(t, x) const_cast<t>(x)
 #else


@@ -610,7 +604,9 @@ enum
     wxWIN32S,                 /*  Windows 32S API */
     wxWIN95,                  /*  Windows 95 */
     wxWIN386,                 /*  Watcom 32-bit supervisor modus */
     wxWIN32S,                 /*  Windows 32S API */
     wxWIN95,                  /*  Windows 95 */
     wxWIN386,                 /*  Watcom 32-bit supervisor modus */

-    wxWINDOWS_CE,             /*  Windows CE */
+    wxWINDOWS_CE,             /*  Windows CE (generic) */
+    wxWINDOWS_POCKETPC,       /*  Windows CE PocketPC */
+    wxWINDOWS_SMARTPHONE,     /*  Windows CE Smartphone */

     wxMGL_UNIX,               /*  MGL with direct hardware access */
     wxMGL_X,                  /*  MGL on X */
     wxMGL_WIN32,              /*  MGL on Win32 */
     wxMGL_UNIX,               /*  MGL with direct hardware access */
     wxMGL_X,                  /*  MGL on X */
     wxMGL_WIN32,              /*  MGL on Win32 */


@@ -618,7 +614,8 @@ enum
     wxMGL_DOS,                /*  MGL on MS-DOS */
     wxWINDOWS_OS2,            /*  Native OS/2 PM */
     wxUNIX,                   /*  wxBase under Unix */
     wxMGL_DOS,                /*  MGL on MS-DOS */
     wxWINDOWS_OS2,            /*  Native OS/2 PM */
     wxUNIX,                   /*  wxBase under Unix */

-    wxX11                     /*  Plain X11 and Universal widgets */
+    wxX11,                    /*  Plain X11 and Universal widgets */
+    wxPALMOS                  /*  PalmOS */

 };
 
 /*  ---------------------------------------------------------------------------- */
 };
 
 /*  ---------------------------------------------------------------------------- */


@@ -1359,6 +1356,10 @@ enum wxBorder
 #define wxFRAME_EX_CONTEXTHELP  0x00000004
 #define wxDIALOG_EX_CONTEXTHELP 0x00000004
 
 #define wxFRAME_EX_CONTEXTHELP  0x00000004
 #define wxDIALOG_EX_CONTEXTHELP 0x00000004
 

+/*  Draw the window in a metal theme on Mac */
+#define wxFRAME_EX_METAL                0x00000040
+#define wxDIALOG_EX_METAL               0x00000040
+

 /*  Create a window which is attachable to another top level window */
 #define wxFRAME_DRAWER          0x0020
 
 /*  Create a window which is attachable to another top level window */
 #define wxFRAME_DRAWER          0x0020
 


@@ -1369,20 +1370,6 @@ enum wxBorder
 
 #define wxFRAME_NO_WINDOW_MENU  0x0100
 
 
 #define wxFRAME_NO_WINDOW_MENU  0x0100
 

-/*
- * wxExtDialog style flags
- */
-#define wxED_CLIENT_MARGIN      0x0004
-#define wxED_BUTTONS_BOTTOM     0x0000  /*  has no effect */
-#define wxED_BUTTONS_RIGHT      0x0002
-#define wxED_STATIC_LINE        0x0001
-
-#if defined(__WXMSW__) || defined(__WXMAC__)
-#   define wxEXT_DIALOG_STYLE  (wxDEFAULT_DIALOG_STYLE|wxED_CLIENT_MARGIN)
-#else
-#   define wxEXT_DIALOG_STYLE  (wxDEFAULT_DIALOG_STYLE|wxED_CLIENT_MARGIN|wxED_STATIC_LINE)
-#endif
-

 /*
  * wxMenuBar style flags
  */
 /*
  * wxMenuBar style flags
  */


@@ -1496,6 +1483,7 @@ enum wxBorder
 #define wxNB_BOTTOM           0x0080
 #define wxNB_MULTILINE        0x0100
 #define wxNB_NOPAGETHEME      0x0200
 #define wxNB_BOTTOM           0x0080
 #define wxNB_MULTILINE        0x0100
 #define wxNB_NOPAGETHEME      0x0200

+#define wxNB_FLAT             0x0400

 #define wxNB_DEFAULT          wxNB_TOP
 
 /*
 #define wxNB_DEFAULT          wxNB_TOP
 
 /*


@@ -1953,7 +1941,7 @@ enum wxKeyCode
     WXK_SPACE   =    32,
     WXK_DELETE  =    127,
 
     WXK_SPACE   =    32,
     WXK_DELETE  =    127,
 

-    /* These are, by design, not compatable with unicode characters.
+    /* 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.                           */
     WXK_START   = 300,
        If you want to get a unicode character from a key event, use
        wxKeyEvent::GetUnicodeKey instead.                           */
     WXK_START   = 300,


@@ -2058,7 +2046,29 @@ enum wxKeyCode
     WXK_WINDOWS_LEFT,
     WXK_WINDOWS_RIGHT,
     WXK_WINDOWS_MENU ,
     WXK_WINDOWS_LEFT,
     WXK_WINDOWS_RIGHT,
     WXK_WINDOWS_MENU ,

-    WXK_COMMAND
+    WXK_COMMAND,
+
+    /* Hardware-specific buttons */
+    WXK_SPECIAL1 = 193,
+    WXK_SPECIAL2,
+    WXK_SPECIAL3,
+    WXK_SPECIAL4,
+    WXK_SPECIAL5,
+    WXK_SPECIAL6,
+    WXK_SPECIAL7,
+    WXK_SPECIAL8,
+    WXK_SPECIAL9,
+    WXK_SPECIAL10,
+    WXK_SPECIAL11,
+    WXK_SPECIAL12,
+    WXK_SPECIAL13,
+    WXK_SPECIAL14,
+    WXK_SPECIAL15,
+    WXK_SPECIAL16,
+    WXK_SPECIAL17,
+    WXK_SPECIAL18,
+    WXK_SPECIAL19,
+    WXK_SPECIAL20

 };
 
 #if wxUSE_HOTKEY
 };
 
 #if wxUSE_HOTKEY


@@ -2244,8 +2254,6 @@ enum wxUpdateUI
 typedef unsigned char WXCOLORREF[6];
 typedef void*       WXCGIMAGEREF;
 typedef void*       WXHBITMAP;
 typedef unsigned char WXCOLORREF[6];
 typedef void*       WXCGIMAGEREF;
 typedef void*       WXHBITMAP;

-//typedef void*       WXHMETAFILE;
-//typedef void*       WXHICON;

 typedef void*       WXHCURSOR;
 typedef void*       WXHRGN;
 typedef void*       WXRECTPTR;
 typedef void*       WXHCURSOR;
 typedef void*       WXHRGN;
 typedef void*       WXRECTPTR;