pragma fix for gcc

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index ae282dcf5eb6ffd0d097ab17729ffc1f5e80f797..8cb02a12d82a446f5d4fe9ed5ce6f40c922512ae 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -37,6 +37,12 @@
     #endif
 #endif // Win32
 
     #endif
 #endif // Win32
 

+#if defined(__WXMSW__) || defined(__WIN32__)
+    #if !defined(__WINDOWS__)
+        #define __WINDOWS__
+    #endif
+#endif
+

 #ifdef __WXWINE__
     #ifndef __WIN32__
         #define __WIN32__
 #ifdef __WXWINE__
     #ifndef __WIN32__
         #define __WIN32__


@@ -112,41 +118,26 @@
         #define __HPUX__
     #endif // HP-UX
 
         #define __HPUX__
     #endif // HP-UX
 

-    #if defined(__APPLE__)
-        // MacOS X
-        #ifndef __WXMAC__
-            #define __WXMAC__
-        #endif
-        #ifndef __WXMAC_X__
-            // This define really should not be necessary since __WXMAC__
-            // combined with __UNIX__ is sufficient to differentiate
-            // Classic Mac OS from Mac OS X. However, some code has been
-            // added to workaround defects(?) in the bundled gcc compiler
-            // and these corrections are identified by __WXMAC_X__
-            #define __WXMAC_X__
-        #endif
+    #if defined(__WXMAC__) && defined(__DARWIN__)
+        // Mac OS X
+
+        // Some code has been added to workaround defects(?) in the
+        // bundled gcc compiler. These corrections are identified by:
+        // __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)

 
         #include <Carbon/Carbon.h>
 
         #include <Carbon/Carbon.h>

-    #endif // __APPLE__
+    #endif // __WXMAC__ && __DARWIN__

 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       // MacOS
 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       // MacOS

-#elif defined(__WXMAC__) && defined(__APPLE__)
-    // MacOS X
+#elif defined(__WXMAC__) && defined(__DARWIN__)
+    // Mac OS X

     #define __UNIX_LIKE__
 
     #define __UNIX_LIKE__
 

-    #ifndef __WXMAC__
-        #define __WXMAC__
-    #endif
-    #ifndef __WXMAC_X__
-        // This define really should not be necessary since __WXMAC__
-        // combined with __UNIX__ is sufficient to differentiate
-        // Classic Mac OS from Mac OS X. However, some code has been
-        // added to workaround defects(?) in the bundled gcc compiler
-        // and these corrections are identified by __WXMAC_X__
-        #define __WXMAC_X__
-    #endif
+    // Some code has been added to workaround defects(?) in the
+    // bundled gcc compiler. These corrections are identified by:
+    // __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)

 
     #include <Carbon/Carbon.h>
 #elif defined(__OS2__)
 
     #include <Carbon/Carbon.h>
 #elif defined(__OS2__)


@@ -1107,22 +1098,6 @@ enum wxBorder
 #define wxLB_HSCROLL        wxHSCROLL
 // always show an entire number of rows
 #define wxLB_INT_HEIGHT     0x0800
 #define wxLB_HSCROLL        wxHSCROLL
 // always show an entire number of rows
 #define wxLB_INT_HEIGHT     0x0800

-/*
- * wxTextCtrl style flags
- */
-// 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
-// this style means to use RICHEDIT control and does something only under wxMSW
-// and Win32 and is silently ignored under all other platforms
-#define wxTE_RICH           0x0080
-#define wxTE_NO_VSCROLL     0x0100
-#define wxTE_AUTO_SCROLL    0x0200
-#define wxTE_PROCESS_ENTER  0x0400
-#define wxTE_PASSWORD       0x0800

 
 // use wxHSCROLL to not wrap text at all, wxTE_LINEWRAP to wrap it at any
 // position and wxTE_WORDWRAP to wrap at words boundary
 
 // use wxHSCROLL to not wrap text at all, wxTE_LINEWRAP to wrap it at any
 // position and wxTE_WORDWRAP to wrap at words boundary


@@ -1195,16 +1170,6 @@ enum wxBorder
 #define wxSB_HORIZONTAL      wxHORIZONTAL
 #define wxSB_VERTICAL        wxVERTICAL
 
 #define wxSB_HORIZONTAL      wxHORIZONTAL
 #define wxSB_VERTICAL        wxVERTICAL
 

-/*
- * wxButton flags (Win32 only)
- */
-#define wxBU_AUTODRAW        0x0004
-#define wxBU_NOAUTODRAW      0x0000
-#define wxBU_LEFT            0x0040
-#define wxBU_TOP             0x0080
-#define wxBU_RIGHT           0x0100
-#define wxBU_BOTTOM          0x0200
-

 /*
  * wxTreeCtrl flags
  */
 /*
  * wxTreeCtrl flags
  */


@@ -1244,14 +1209,6 @@ enum wxBorder
 #define wxSP_FULLSASH         0x0400
 #define wxSP_3D               (wxSP_3DBORDER | wxSP_3DSASH)
 
 #define wxSP_FULLSASH         0x0400
 #define wxSP_3D               (wxSP_3DBORDER | wxSP_3DSASH)
 

-/*
- * wxTabCtrl flags
- */
-#define wxTC_MULTILINE        0x0000
-#define wxTC_RIGHTJUSTIFY     0x0010
-#define wxTC_FIXEDWIDTH       0x0020
-#define wxTC_OWNERDRAW        0x0040
-

 /*
  * wxNotebook flags
  */
 /*
  * wxNotebook flags
  */


@@ -1262,6 +1219,14 @@ enum wxBorder
 #define wxNB_BOTTOM           0x0080
 #define wxNB_MULTILINE        0x0100
 
 #define wxNB_BOTTOM           0x0080
 #define wxNB_MULTILINE        0x0100
 

+/*
+ * wxTabCtrl flags
+ */
+#define wxTC_RIGHTJUSTIFY     0x0010
+#define wxTC_FIXEDWIDTH       0x0020
+#define wxTC_OWNERDRAW        0x0040
+#define wxTC_MULTILINE        wxNB_MULTILINE
+

 /*
  * wxStatusBar95 flags
  */
 /*
  * wxStatusBar95 flags
  */


@@ -2026,7 +1991,6 @@ typedef void*           WXGC;
 typedef void*           WXRegion;
 typedef void*           WXFont;
 typedef void*           WXImage;
 typedef void*           WXRegion;
 typedef void*           WXFont;
 typedef void*           WXImage;

-typedef void*           WXCursor;

 typedef void*           WXFontList;
 
 typedef unsigned long   Atom;  /* this might fail on a few architectures */
 typedef void*           WXFontList;
 
 typedef unsigned long   Atom;  /* this might fail on a few architectures */