value of wxTE_PASSWORD changed to be different from wxCANCEL

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index d1717e5a402db2c8ffd9c9789cefba1eb4dc6b50..ff94eca93888b90f1a9c8cf9bdcd5aa23c7e7bdc 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -164,9 +164,11 @@
 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

-// wxWindows checks for WIN32, not __WIN32__
-#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
-#define __WIN32__
+
+#if defined(_WIN32) || defined(WIN32) || defined(__NT__)
+    #ifndef __WIN32__
+        #define __WIN32__
+    #endif

 #endif
 
 #ifdef __WXWINE__
 #endif
 
 #ifdef __WXWINE__


@@ -634,9 +636,9 @@ enum
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)
 
 typedef float wxFloat32 ;
 #if defined( __WXMAC__ )  && defined (__MWERKS__)

-    typedef short double       wxFloat64;
+    typedef short double wxFloat64;

 #else
 #else

-    typedef double                     wxFloat64;
+    typedef double wxFloat64;

 #endif
 
 #if defined( __WXMAC__ )  && !defined( __POWERPC__ )
 #endif
 
 #if defined( __WXMAC__ )  && !defined( __POWERPC__ )


@@ -666,30 +668,30 @@ typedef float wxFloat32 ;
 #if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh )
 // assembler versions for these
 #ifdef __POWERPC__
 #if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh )
 // assembler versions for these
 #ifdef __POWERPC__

-       inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i )
-               {return (__lhbrx( &i , 0 ) ) ;}
-       inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i )
-               {return (__lhbrx( &i , 0 ) ) ;}
-       inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i )
-               {return (__lwbrx( &i , 0 ) ) ;}
-       inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i )
-               {return (__lwbrx( &i , 0 ) ) ;}
+    inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i )
+        {return (__lhbrx( &i , 0 ) ) ;}
+    inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i )
+        {return (__lhbrx( &i , 0 ) ) ;}
+    inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i )
+        {return (__lwbrx( &i , 0 ) ) ;}
+    inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i )
+        {return (__lwbrx( &i , 0 ) ) ;}

 #else
 #else

-       #pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0)
-       pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value)
-               = { 0xE158 };
-       
-       #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
-       pascal wxInt16 wxUINT16_SWAP_ALWAYS(wxInt16 value)
-               = { 0xE158 };
-
-       #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
-       pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value)
-               = { 0xE158, 0x4840, 0xE158 };
-
-       #pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
-       pascal wxInt32 wxUINT32_SWAP_ALWAYS(wxInt32 value)
-               = { 0xE158, 0x4840, 0xE158 };
+    #pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0)
+    pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value)
+        = { 0xE158 };
+
+    #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
+    pascal wxInt16 wxUINT16_SWAP_ALWAYS(wxInt16 value)
+        = { 0xE158 };
+
+    #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
+    pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value)
+        = { 0xE158, 0x4840, 0xE158 };
+
+    #pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
+    pascal wxInt32 wxUINT32_SWAP_ALWAYS(wxInt32 value)
+        = { 0xE158, 0x4840, 0xE158 };

 
 #endif
 #else // !MWERKS
 
 #endif
 #else // !MWERKS


@@ -961,10 +963,9 @@ enum wxStretch
 /*
  * wxTextCtrl style flags
  */
 /*
  * wxTextCtrl style flags
  */

-#define wxPROCESS_ENTER     0x0004
-#define wxPASSWORD          0x0008
-#define wxTE_PROCESS_ENTER  wxPROCESS_ENTER
-#define wxTE_PASSWORD       wxPASSWORD
+// the flag bits 0x0001, 2, 4 and 8 are free but should be used only for the
+// things which don't make sense for a text control used by wxTextEntryDialog
+// because they would otherwise conflict with wxOK, wxCANCEL, wxCENTRE

 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 #define wxTE_PROCESS_TAB    0x0040
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 #define wxTE_PROCESS_TAB    0x0040


@@ -973,6 +974,10 @@ enum wxStretch
 #define wxTE_RICH           0x0080
 #define wxTE_NO_VSCROLL     0x0100
 #define wxTE_AUTO_SCROLL    0x0200
 #define wxTE_RICH           0x0080
 #define wxTE_NO_VSCROLL     0x0100
 #define wxTE_AUTO_SCROLL    0x0200

+#define wxPROCESS_ENTER     0x0400
+#define wxPASSWORD          0x0800
+#define wxTE_PROCESS_ENTER  wxPROCESS_ENTER
+#define wxTE_PASSWORD       wxPASSWORD

 
 /*
  * wxComboBox style flags
 
 /*
  * wxComboBox style flags


@@ -1138,7 +1143,8 @@ enum wxStretch
 #define wxPD_AUTO_HIDE          0x0004
 #define wxPD_ELAPSED_TIME       0x0008
 #define wxPD_ESTIMATED_TIME     0x0010
 #define wxPD_AUTO_HIDE          0x0004
 #define wxPD_ELAPSED_TIME       0x0008
 #define wxPD_ESTIMATED_TIME     0x0010

-#define wxPD_REMAINING_TIME     0x0020
+// wxGA_SMOOTH = 0x0020 may also be used with wxProgressDialog
+#define wxPD_REMAINING_TIME     0x0040

 
 /*
  * wxHtmlWindow flags
 
 /*
  * wxHtmlWindow flags


@@ -1313,6 +1319,8 @@ enum {
 
 // Brush & Pen Stippling. Note that a stippled pen cannot be dashed!!
 // Note also that stippling a Pen IS meaningfull, because a Line is
 
 // Brush & Pen Stippling. Note that a stippled pen cannot be dashed!!
 // Note also that stippling a Pen IS meaningfull, because a Line is

+  wxSTIPPLE_MASK_OPAQUE, //mask is used for blitting monochrome using text fore and back ground colors
+  wxSTIPPLE_MASK,        //mask is used for masking areas in the stipple bitmap (TO DO)

 // drawn with a Pen, and without any Brush -- and it can be stippled.
   wxSTIPPLE =          110,
   wxBDIAGONAL_HATCH,
 // drawn with a Pen, and without any Brush -- and it can be stippled.
   wxSTIPPLE =          110,
   wxBDIAGONAL_HATCH,


@@ -1648,28 +1656,28 @@ typedef enum {
 
 #ifdef __WXMAC__
 
 
 #ifdef __WXMAC__
 

-typedef WindowPtr      WXHWND;
-typedef Handle                         WXHANDLE;
-typedef CIconHandle            WXHICON;
+typedef WindowPtr       WXHWND;
+typedef Handle               WXHANDLE;
+typedef CIconHandle        WXHICON;

 //typedef unsigned long   WXHFONT;
 //typedef unsigned long   WXHFONT;

-typedef MenuHandle     WXHMENU;
+typedef MenuHandle       WXHMENU;

 //typedef unsigned long   WXHPEN;
 //typedef unsigned long   WXHBRUSH;
 //typedef unsigned long   WXHPALETTE;
 //typedef unsigned long   WXHPEN;
 //typedef unsigned long   WXHBRUSH;
 //typedef unsigned long   WXHPALETTE;

-typedef CursHandle     WXHCURSOR;
-typedef RgnHandle      WXHRGN;
+typedef CursHandle       WXHCURSOR;
+typedef RgnHandle       WXHRGN;

 //typedef unsigned long   WXHACCEL;
 //typedef unsigned long   WXHINSTANCE;
 typedef GWorldPtr   WXHBITMAP;
 //typedef unsigned long   WXHIMAGELIST;
 //typedef unsigned long   WXHGLOBAL;
 //typedef unsigned long   WXHACCEL;
 //typedef unsigned long   WXHINSTANCE;
 typedef GWorldPtr   WXHBITMAP;
 //typedef unsigned long   WXHIMAGELIST;
 //typedef unsigned long   WXHGLOBAL;

-typedef GrafPtr                WXHDC;
+typedef GrafPtr           WXHDC;

 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
 //typedef unsigned int    WXWPARAM;
 //typedef long            WXLPARAM;
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
 //typedef unsigned int    WXWPARAM;
 //typedef long            WXLPARAM;

-typedef RGBColor               WXCOLORREF;
+typedef RGBColor           WXCOLORREF;

 //typedef void *          WXRGNDATA;
 //typedef void *          WXMSG;
 //typedef unsigned long   WXHCONV;
 //typedef void *          WXRGNDATA;
 //typedef void *          WXMSG;
 //typedef unsigned long   WXHCONV;


@@ -1803,7 +1811,9 @@ typedef WXHWND WXWidget;
         #endif
     #endif // no FAR
 #else // Win32
         #endif
     #endif // no FAR
 #else // Win32

-    #define FAR
+    #ifndef FAR
+        #define FAR
+    #endif

 #endif // Win16/32
 
 #endif // MSW
 #endif // Win16/32
 
 #endif // MSW


@@ -1871,8 +1881,8 @@ typedef struct _GtkTooltips       GtkTooltips;
 typedef struct _GtkNotebook       GtkNotebook;
 typedef struct _GtkNotebookPage   GtkNotebookPage;
 typedef struct _GtkAccelGroup     GtkAccelGroup;
 typedef struct _GtkNotebook       GtkNotebook;
 typedef struct _GtkNotebookPage   GtkNotebookPage;
 typedef struct _GtkAccelGroup     GtkAccelGroup;

-typedef        struct _GtkItemFactory    GtkItemFactory;
-typedef        struct _GtkSelectionData  GtkSelectionData;
+typedef struct _GtkItemFactory    GtkItemFactory;
+typedef struct _GtkSelectionData  GtkSelectionData;

 
 typedef GtkWidget *WXWidget;
 #endif // GTK
 
 typedef GtkWidget *WXWidget;
 #endif // GTK