Added some tentative wxMotif clipboard code; did some file formatting

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 095cb07c4e96e504b34532bc3d9c2d8f471354fc..41839c1cdcce4d3d7665c0dc04ab2db26d6a6797 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -107,6 +107,8 @@
     #if (__MWERKS__ < 0x1000) || !__option(bool)
         typedef unsigned int bool;
     #endif
     #if (__MWERKS__ < 0x1000) || !__option(bool)
         typedef unsigned int bool;
     #endif

+#elif defined(__SC__)
+    typedef unsigned int bool;

 #elif defined(_MSC_VER) && (_MSC_VER <= 1000)
     typedef unsigned int bool;
 #elif defined(_MSC_VER) && (_MSC_VER == 1020)
 #elif defined(_MSC_VER) && (_MSC_VER <= 1000)
     typedef unsigned int bool;
 #elif defined(_MSC_VER) && (_MSC_VER == 1020)


@@ -120,7 +122,7 @@
     typedef unsigned char bool;
 #endif
 
     typedef unsigned char bool;
 #endif
 

-#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__))
+#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__)

     #define byte unsigned char
 #endif
 
     #define byte unsigned char
 #endif
 


@@ -193,7 +195,7 @@ class WXDLLEXPORT wxEvent;
 
  /** symbolic constant used by all Find()-like functions returning positive
       integer on success as failure indicator */
 
  /** symbolic constant used by all Find()-like functions returning positive
       integer on success as failure indicator */

-#define NOT_FOUND       (-1)
+#define wxNOT_FOUND       (-1)

 
 // ----------------------------------------------------------------------------
 // Error codes
 
 // ----------------------------------------------------------------------------
 // Error codes


@@ -727,18 +729,25 @@ typedef enum
 // Don't do parent client adjustments (for implementation only)
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 
 // Don't do parent client adjustments (for implementation only)
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 

-
-/* Data format for drag & drop and clipboard operations
- * numbers as per winuser.h */
-

 enum wxDataFormat
 {
 enum wxDataFormat
 {

+  wxDF_INVALID =          0,

   wxDF_TEXT =             1,  /* CF_TEXT */
   wxDF_BITMAP =           2,  /* CF_BITMAP */
   wxDF_METAFILE =         3,  /* CF_METAFILEPICT */
   wxDF_TEXT =             1,  /* CF_TEXT */
   wxDF_BITMAP =           2,  /* CF_BITMAP */
   wxDF_METAFILE =         3,  /* CF_METAFILEPICT */

-  wxDF_DIB =              8,  /* CF_DIB */
+  wxDF_SYLK =             4,
+  wxDF_DIF =              5,
+  wxDF_TIFF =             6,

   wxDF_OEMTEXT =          7,  /* CF_OEMTEXT */
   wxDF_OEMTEXT =          7,  /* CF_OEMTEXT */

+  wxDF_DIB =              8,  /* CF_DIB */
+  wxDF_PALETTE =          9,
+  wxDF_PENDATA =          10,
+  wxDF_RIFF =             11,
+  wxDF_WAVE =             12,
+  wxDF_UNICODETEXT =      13,
+  wxDF_ENHMETAFILE =      14,

   wxDF_FILENAME =         15, /* CF_HDROP */
   wxDF_FILENAME =         15, /* CF_HDROP */

+  wxDF_LOCALE =           16,

   wxDF_PRIVATE =          20
 };
 
   wxDF_PRIVATE =          20
 };
 


@@ -995,6 +1004,39 @@ typedef struct _GtkNotebookPage GtkNotebookPage;
 
 #endif
 
 
 #endif
 

+// This is required because of clashing macros in windows.h, which may be
+// included before or after wxWindows classes, and therefore must be
+// disabled here before any significant wxWindows headers are included.
+#ifdef __WXMSW__
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
+#ifdef GetClassName
+#undef GetClassName
+#endif
+
+#ifdef DrawText
+#undef DrawText
+#endif
+
+#ifdef GetCharWidth
+#undef GetCharWidth
+#endif
+
+#ifdef StartDoc
+#undef StartDoc
+#endif
+
+#ifdef FindWindow
+#undef FindWindow
+#endif
+
+#ifdef FindResource
+#undef FindResource
+#endif
+#endif
+  // __WXMSW__

 
 #endif
     // _WX_DEFS_H_
 
 #endif
     // _WX_DEFS_H_