*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index b9f0a123c4f18a579ea1f88b6e1a982b18ff5bcf..cb603db5e9977f74f477e85aa5f6f21fe972c8a1 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -438,7 +438,7 @@ enum
   wxWIN95,                  // Windows 95
   wxWIN386,                 // Watcom 32-bit supervisor modus
   wxMGL_UNIX,               // MGL with direct hardware access
   wxWIN95,                  // Windows 95
   wxWIN386,                 // Watcom 32-bit supervisor modus
   wxMGL_UNIX,               // MGL with direct hardware access

-  wxMGL_X,                  // MGL on X 
+  wxMGL_X,                  // MGL on X

   wxMGL_WIN32,              // MGL on Win32
   wxMGL_OS2                 // MGL on OS/2
 };
   wxMGL_WIN32,              // MGL on Win32
   wxMGL_OS2                 // MGL on OS/2
 };


@@ -450,53 +450,53 @@ enum
 // fixed length types
 
 #define wxInt8    char    signed
 // fixed length types
 
 #define wxInt8    char    signed

-#define wxUint8   char  unsigned  
+#define wxUint8   char  unsigned

 
 #ifdef __WIN16__
 
 #ifdef __WIN16__

-#define wxInt16    int    signed  
-#define wxUint16   int  unsigned  
-#define wxInt32   long    signed  
-#define wxUint32  long  unsigned  
+#define wxInt16    int    signed
+#define wxUint16   int  unsigned
+#define wxInt32   long    signed
+#define wxUint32  long  unsigned

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__

-#define wxInt16  short    signed  
-#define wxUint16 short  unsigned  
-#define wxInt32    int    signed  
-#define wxUint32   int  unsigned  
+#define wxInt16  short    signed
+#define wxUint16 short  unsigned
+#define wxInt32    int    signed
+#define wxUint32   int  unsigned

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-#define wxInt16  short    signed  
-#define wxUint16 short  unsigned  
-#define wxInt32    int    signed  
-#define wxUint32   int  unsigned  
+#define wxInt16  short    signed
+#define wxUint16 short  unsigned
+#define wxInt32    int    signed
+#define wxUint32   int  unsigned

 #endif
 
 #ifdef __WXOS2__
 #endif
 
 #ifdef __WXOS2__

-#define wxInt16  short    signed  
-#define wxUint16 short  unsigned  
-#define wxInt32    int    signed  
-#define wxUint32   int  unsigned  
+#define wxInt16  short    signed
+#define wxUint16 short  unsigned
+#define wxInt32    int    signed
+#define wxUint32   int  unsigned

 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)
     /* well, this shouldn't happen... */
 #endif
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
   #if defined(SIZEOF_INT)
     /* well, this shouldn't happen... */

-    #define wxInt16  short    signed  
-    #define wxUint16 short  unsigned  
-    #define wxInt32    int    signed  
-    #define wxUint32   int  unsigned  
+    #define wxInt16  short    signed
+    #define wxUint16 short  unsigned
+    #define wxInt32    int    signed
+    #define wxUint32   int  unsigned

   #else
   #else

-    #define wxInt16  short    signed  
-    #define wxUint16 short  unsigned  
-    #define wxInt32    int    signed  
-    #define wxUint32   int  unsigned  
+    #define wxInt16  short    signed
+    #define wxUint16 short  unsigned
+    #define wxInt32    int    signed
+    #define wxUint32   int  unsigned

   #endif
 #endif
 
 #define  wxByte   wxUint8
   #endif
 #endif
 
 #define  wxByte   wxUint8

-#define  wxWord   wxUint16        
+#define  wxWord   wxUint16

 
 // byte sex
 
 
 // byte sex
 


@@ -516,12 +516,12 @@ enum
    ((wxUint16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
     (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))
    ((wxUint16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
     (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))

-    
+

 #define wxINT16_SWAP_ALWAYS(val) \
    ((wxInt16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
     (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))
 #define wxINT16_SWAP_ALWAYS(val) \
    ((wxInt16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
     (((wxUint16) (val) & (wxUint16) 0xff00U) >> 8)))

-    
+

 #define wxUINT32_SWAP_ALWAYS(val) \
    ((wxUint32) ( \
     (((wxUint32) (val) & (wxUint32) 0x000000ffU) << 24) | \
 #define wxUINT32_SWAP_ALWAYS(val) \
    ((wxUint32) ( \
     (((wxUint32) (val) & (wxUint32) 0x000000ffU) << 24) | \


@@ -889,10 +889,10 @@ enum
 #define wxPD_REMAINING_TIME     0x0020
 
 /*
 #define wxPD_REMAINING_TIME     0x0020
 
 /*

- * extended dialog specifiers. these values are stored in a different 
+ * extended dialog specifiers. these values are stored in a different

  * flag and thus do not overlap with other style flags. note that these
  * values do not correspond to the return values of the dialogs (for
  * flag and thus do not overlap with other style flags. note that these
  * values do not correspond to the return values of the dialogs (for

- * those values, look at the wxID_XXX defines). 
+ * those values, look at the wxID_XXX defines).

  */
 #define wxOK                    0x00000001
 #define wxYES_NO                0x00000002
  */
 #define wxOK                    0x00000001
 #define wxYES_NO                0x00000002


@@ -1003,8 +1003,8 @@ enum wxDirection
 
 // wxCENTRE                   = 0x0400 (defined above)
 
 
 // wxCENTRE                   = 0x0400 (defined above)
 

-// centering into frame rather than screen 
-#define wxCENTER_FRAME          0x0004  
+// centering into frame rather than screen
+#define wxCENTER_FRAME          0x0004

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -1384,8 +1384,8 @@ typedef enum {
 // platform specific (implementation) parts of the headers
 // ---------------------------------------------------------------------------
 
 // platform specific (implementation) parts of the headers
 // ---------------------------------------------------------------------------
 

-#ifdef __WXMSW__
-// Stand-ins for Windows types, to avoid #including all of windows.h
+#if defined(__WXMSW__) || defined(__WXPM__)
+// Stand-ins for Windows types or OS/2, to avoid #including all of windows.h or os2.h

 typedef unsigned long   WXHWND;
 typedef unsigned long   WXHANDLE;
 typedef unsigned long   WXHICON;
 typedef unsigned long   WXHWND;
 typedef unsigned long   WXHANDLE;
 typedef unsigned long   WXHICON;

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 279d9160a85eb1474302f8b559d2714c0e2b1e43..7db565fd5c7f333bb9805bc779d95eccc1967424 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -29,7 +29,7 @@
 
 #ifndef NO_TEXT_WINDOW_STREAM
     #if wxUSE_STD_IOSTREAM
 
 #ifndef NO_TEXT_WINDOW_STREAM
     #if wxUSE_STD_IOSTREAM

-        #include "ioswrap.h"    // for iostream classes if we need them
+        #include "wx/ioswrap.h"    // for iostream classes if we need them

     #else // !wxUSE_STD_IOSTREAM
         // can't compile this feature in if we don't use streams at all
         #define NO_TEXT_WINDOW_STREAM
     #else // !wxUSE_STD_IOSTREAM
         // can't compile this feature in if we don't use streams at all
         #define NO_TEXT_WINDOW_STREAM

diff --git a/include/wx/thread.h b/include/wx/thread.h
index d4bb7aeac3efbb5ae17ec08d17cba59ea70dcc80..7e0dc5997fa3449608a9802fdb468f719bd25135 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -134,7 +134,7 @@ private:
 
 // in order to avoid any overhead under !MSW make all wxCriticalSection class
 // functions inline - but this can't be done under MSW
 
 // in order to avoid any overhead under !MSW make all wxCriticalSection class
 // functions inline - but this can't be done under MSW

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)

     class WXDLLEXPORT wxCriticalSectionInternal;
     #define WXCRITICAL_INLINE
 #else // !MSW
     class WXDLLEXPORT wxCriticalSectionInternal;
     #define WXCRITICAL_INLINE
 #else // !MSW