*** empty log message ***

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

diff --git a/include/wx/accel.h b/include/wx/accel.h
index a36d4a0a44d987e7310de6e4af4ff65a872a71ca..cc3423b7218171d326cec38259f5775d49863a1a 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -11,6 +11,8 @@
 #include "wx/qt/accel.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/accel.h"
+#elif defined(__WXPM__)
+#include "wx/os2/accel.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/accel.h"
 #endif

diff --git a/include/wx/app.h b/include/wx/app.h
index 85e28145a8221978ec37ba58495d01440eeda1e7..7deb0a45a78bd97f61d03cb40327dd58f883778d 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -246,6 +246,8 @@ protected:
     #include "wx/gtk/app.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/app.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/app.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/app.h"
 #endif

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index f031e7041aeb319b6b7f9e5dd3baa7d75c9dda0b..f9118cb55e926d47d6886a8b685a2658df128bd8 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -11,6 +11,8 @@
 #include "wx/qt/bitmap.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
+#elif defined(__WXPM__)
+#include "wx/os2/bitmap.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/bitmap.h"
 #endif

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 2ff65ebbb254b11a92330021addbd4943f6d8770..f753cd2409220f95fec14c3369d3dd210ddd171d 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -11,6 +11,8 @@
 #include "wx/qt/bmpbuttn.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/bmpbuttn.h"
+#elif defined(__WXPM__)
+#include "wx/os2/bmpbuttn.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/bmpbuttn.h"
 #endif

diff --git a/include/wx/brush.h b/include/wx/brush.h
index e5d99b39a18bd282f23ac6d3c11c1f9a41ead65f..3955876d1d876b44109f6557ddebde72e7c35020 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -11,6 +11,8 @@
 #include "wx/qt/brush.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/brush.h"
+#elif defined(__WXPM__)
+#include "wx/os2/brush.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/brush.h"
 #endif

diff --git a/include/wx/button.h b/include/wx/button.h
index 454a0a58f6c3c4868d458019ddbb8b8dac55d607..31d4e12d0af1836a3ec5f5728bed2999a416084a 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -11,6 +11,8 @@
 #include "wx/qt/button.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/button.h"
+#elif defined(__WXPM__)
+#include "wx/os2/button.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/button.h"
 #endif

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 47895df8cd97c84ef596caa8e88129fc12e6f5b1..ac6e7e992b5f7c364af57edf8cd8f590be42259e 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -11,6 +11,8 @@
 #include "wx/qt/checkbox.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/checkbox.h"
+#elif defined(__WXPM__)
+#include "wx/os2/checkbox.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/checkbox.h"
 #endif

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index 96f31e454f18d2c725e575d63a849a8238890cfd..4528bb8f8408fefec6d1b8e12694ebc821eed2cb 100644 (file)
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -11,6 +11,8 @@
 #include "wx/qt/checklst.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/checklst.h"
+#elif defined(__WXPM__)
+#include "wx/os2/checklst.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/checklst.h"
 #endif

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 9940c9f69fdbf938aa2f34e9d74a4b917d5f3ccd..bfe28e0ed1d5f83541578128107ec792f25391af 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -120,6 +120,8 @@ private:
     #include "wx/qt/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/choice.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/choice.h"
 #endif

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index c37f46116fd27afdc5d68ec418703d37244362cc..36a95b06382bc19557b5830fe5f7ca70cb847001 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -11,6 +11,8 @@
 #include "wx/gtk/clipbrd.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/clipbrd.h"
+#elif defined(__WXPM__)
+#include "wx/os2/clipbrd.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/clipbrd.h"
 #endif

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index ce6cf7c866160f456903e1f214bdf8648c6a9823..178e58668c7882ca5e88df9b5024a42d0e7a3390 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -21,7 +21,7 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
 class WXDLLEXPORT wxPrintSetupData;
 #endif
 
@@ -156,7 +156,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void operator=(const wxPrintData& data);
 
     // For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
     void operator=(const wxPrintSetupData& setupData);
 #endif
 

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index a8ca97c25bcdc9154d5c9b3ddacae9a4b67e1926..7500259cb85009f9b8a4734960c33ae7d13e46a7 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -11,6 +11,8 @@
 #include "wx/generic/colrdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/generic/colrdlgg.h"
+#elif defined(__WXPM__)
+#include "wx/generic/colrdlgg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/generic/colrdlgg.h"
 #endif

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 3fff20043186499810cfe7193e0407ba206c987c..dc5706de197457cc18b5dc363b57c19069c7ec6f 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -11,6 +11,8 @@
 #include "wx/qt/colour.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"
+#elif defined(__WXPM__)
+#include "wx/os2/colour.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/colour.h"
 #endif

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 26512aa0cd5460a5e01da7dbd269b946e2329a57..9c80b16565077e0372c78fa69ed96bf5503ccb77 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -11,6 +11,8 @@
 #include "wx/qt/combobox.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/combobox.h"
+#elif defined(__WXPM__)
+#include "wx/os2/combobox.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/combobox.h"
 #endif

diff --git a/include/wx/control.h b/include/wx/control.h
index 33d5486cb7e88e3e1323e790cfd40755ff9fd6b2..c68cfa4e8442930f4f16bee79832d5f4fde9c392 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -62,6 +62,8 @@ protected:
     #include "wx/qt/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/control.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/control.h"
 #endif

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index 4ebe73a97139eff5fe41c323ca03fa0364c3eeb7..2e793baa8aac213dc328ccbe080570aa13e72c12 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -11,6 +11,8 @@
 #include "wx/qt/cursor.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/cursor.h"
+#elif defined(__WXPM__)
+#include "wx/os2/cursor.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/cursor.h"
 #endif

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 3e1df6d487572b4457792ceddf1c839b73c893f0..48f84bca8d84c3ca0b79c6e0e24753ba41e0bc52 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -22,6 +22,8 @@
     #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dnd.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/dnd.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/dnd.h"
 #endif

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 1b60a8e4df003d2d6d4eef45a12fc9dfda03af4f..90fd7f6c9422474d7b101df687938d092a4dcbd4 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -548,6 +548,8 @@ private:
     #include "wx/qt/dc.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dc.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/dc.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/dc.h"
 #endif

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 557e2f4dc21f526cf6366b478cca600254a2f33d..0d7938d875fa65e755e234caeca31426cc1e2e0a 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -11,6 +11,8 @@
 #include "wx/qt/dcclient.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcclient.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcclient.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dcclient.h"
 #endif

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 84a814c4d6c65402e4f860b32e210834fd91cbb3..8e8c4cd3c27fa01516d2be99a4541742cb0f5e07 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -11,6 +11,8 @@
 #include "wx/qt/dcmemory.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcmemory.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcmemory.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dcmemory.h"
 #endif

diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h
index 532323e9d25924dfe8aae2e4e447cb7bde60c3da..37ebb5469c8a0cf0e6c378f6f6485047fa12fe0c 100644 (file)
--- a/include/wx/dcprint.h
+++ b/include/wx/dcprint.h
@@ -4,6 +4,9 @@
 #if defined(__WXMSW__)
 #include "wx/msw/dcprint.h"
 #endif
+#if defined(__WXPM__)
+#include "wx/os2/dcprint.h"
+#endif
 
 #endif
     // _WX_DCPRINT_H_BASE_

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index bd35719499d2d1b07737a4e3d8aa8026a2e6fe88..d6aa6e15152a06a6989170b82bd37f78dd760510 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -11,6 +11,8 @@
 #include "wx/qt/dcscreen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dcscreen.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcscreen.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dcscreen.h"
 #endif

diff --git a/include/wx/dde.h b/include/wx/dde.h
index 908fb09388761e40bfe9ad99bd782aa4c4c6edd2..a77e343d167e552f2fa59c0239abbceac39bb0d2 100644 (file)
--- a/include/wx/dde.h
+++ b/include/wx/dde.h
@@ -11,6 +11,8 @@
 #include "wx/qt/dde.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dde.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dde.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dde.h"
 #endif

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 302766b90a46eb212fa4a848e4a81db6402a7e78..b9f0a123c4f18a579ea1f88b6e1a982b18ff5bcf 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -68,6 +68,17 @@
 
 #elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) )
         // MacOS
+#elif defined(__OS2__)
+    #if defined(__IBMCPP__)
+        #define __VISAGEAVER__ __IBMCPP__
+    #endif
+    #ifndef __WXOS2__
+        #define __WXOS2__
+    #endif
+    #ifndef __WXPM__
+        #define __WXPM__
+    #endif
+    // Place other OS/2 compiler environment defines here
 #else   // Windows
     #ifndef __WINDOWS__
         #define __WINDOWS__
@@ -175,9 +186,9 @@
 // Make sure the environment is set correctly
 #if defined(__WXMSW__) && defined(__X__)
     #error "Target can't be both X and Windows"
-#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
+#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXPM__) && \
       !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)
-    #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]"
+    #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXPM__|__WXSTUBS__]"
 #endif
 
 // ============================================================================
@@ -188,7 +199,7 @@
 // check for native bool type and TRUE/FALSE constants
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXPM__) || defined(__WXSTUBS__)
     // Bool is now obsolete, use bool instead
     // typedef int Bool;
 
@@ -233,6 +244,9 @@
     #elif defined(__GNUWIN32__)
         // Cygwin supports bool
         #define HAVE_BOOL
+    #elif defined(__VISAGECPP__)
+        typedef unsigned long bool;
+        #define HAVE_BOOL
     #endif // compilers
 #endif // HAVE_BOOL
 
@@ -263,7 +277,7 @@ typedef int wxWindowID;
  * Making or using wxWindows as a Windows DLL
  */
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
 
 // _declspec works in BC++ 5 and later, as well as VC++
 #if defined(__VISUALC__) || defined(__BORLANDC__)
@@ -282,6 +296,22 @@ typedef int wxWindowID;
 #    define WXDLLEXPORT_CTORFN
 #  endif
 
+#elif defined(__WXPM__)
+
+#  ifdef WXMAKINGDLL
+#    define WXDLLEXPORT _Export
+#    define WXDLLEXPORT_DATA(type) _Export type
+#    define WXDLLEXPORT_CTORFN
+#  elif defined(WXUSINGDLL)
+#    define WXDLLEXPORT _Export
+#    define WXDLLEXPORT_DATA(type) _Export type
+#    define WXDLLEXPORT_CTORFN
+#  else
+#    define WXDLLEXPORT
+#    define WXDLLEXPORT_DATA(type) type
+#    define WXDLLEXPORT_CTORFN
+#  endif
+
 #else
 #  define WXDLLEXPORT
 #  define WXDLLEXPORT_DATA(type) type

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 709d6f5f0bdc47a933ae3539a590434b2f5ba227..8a4737c2f40f7164b35de73b895ed49aa11ea904 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -75,6 +75,8 @@ protected:
     #include "wx/qt/dialog.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dialog.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/dialog.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/dialog.h"
 #endif

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index f2d1dbbdf242076d46f5fe3f449437a768cc5c5b..5da68a5a45a98a012b7486ebd2f764db3eb6eaa5 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -15,6 +15,8 @@
 #include "wx/qt/dirdlg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dirdlg.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dirdlg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dirdlg.h"
 #endif

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index d67e09fc7a739b212b7c5492158bb49475527564..f6ddf8925587d43210e7a135af2ae2bc5182052c 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -13,6 +13,8 @@
 #include "wx/qt/dnd.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/dnd.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dnd.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/dnd.h"
 #endif

diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h
index dbbce924d2d647a6cc3b45274eb4a4c04482abdf..02da2e77dde7f4ef56a4b63d46d88b0675f0baa8 100644 (file)
--- a/include/wx/dragimag.h
+++ b/include/wx/dragimag.h
@@ -15,6 +15,8 @@
 #include "wx/generic/dragimag.h"
 #elif defined(__WXMAC__)
 #include "wx/generic/dragimag.h"
+#elif defined(__WXPM__)
+#include "wx/generic/dragimag.h"
 #elif defined(__WXSTUBS__)
 #include "wx/generic/dragimag.h"
 #endif

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index e1ee899f16f05c39ad56babbe44872fea9250526..b05f260955c26951005da67ec6e2de47e0987a41 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -44,8 +44,10 @@
  must return negative value, 0 or positive value if pItem1 <, = or > pItem2
  */
 
-#ifdef  __VISUALC__
+#if defined(__VISUALC__)
   #define   CMPFUNC_CONV    _cdecl
+#elif defined(__VISAGECPP__)
+  #define   CMPFUNC_CONV    _Optlink
 #else   // !Visual C++
   #define   CMPFUNC_CONV
 #endif  // compiler

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 5788c2a743b5ee4ffcad78c43a45dbc8e8ee9a7e..08026653776377f1eca45d7093fa55ad24f51428 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -42,6 +42,10 @@
 #elif defined(__WINDOWS__)
 #   include <windows.h>
     typedef HMODULE wxDllType;
+#elif defined(__OS2__)
+#   define INCL_DOS
+#   include <os2.h>
+    typedef HMODULE wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;
 #else

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 7fc2e7a76ecf92b1667e7e48d0aa7ff8ed4905ce..7ce866145b2566d06cb109cc0ab7c68668343b75 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -11,6 +11,8 @@
 #include "wx/qt/filedlg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/filedlg.h"
+#elif defined(__WXPM__)
+#include "wx/os2/filedlg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/filedlg.h"
 #endif

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 22db00222bfefd7df862f4307f70dffe8cd4f36d..b7455424ad00917870a6039b84b01725ad89727d 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -173,7 +173,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #ifdef  __UNIX__
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX
-#else   // Windows
+#else   // Windows and OS/2
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_DOS
 #endif  // Unix/Windows
@@ -182,7 +182,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
 #ifdef  __UNIX__
   #define wxARE_FILENAMES_CASE_SENSITIVE  TRUE
-#else   // Windows
+#else   // Windows and OS/2
   #define wxARE_FILENAMES_CASE_SENSITIVE  FALSE
 #endif  // Unix/Windows
 

diff --git a/include/wx/font.h b/include/wx/font.h
index 165c9c9f06452984ab3b408b7ce5f11b0c7afce5..fdd9d9d8c69f05908c43d96844f6f9792117b5b2 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -11,6 +11,8 @@
 #include "wx/qt/font.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/font.h"
+#elif defined(__WXPM__)
+#include "wx/os2/font.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/font.h"
 #endif

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index f851cd8ee96f5de7314439724d23b5033b35ed6d..559d903ec2223a0ce701d095d1deb60f3c514b5c 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -19,6 +19,10 @@
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #   define sm_classwxFontDialog sm_classwxGenericFontDialog
+#elif defined(__WXPM__)
+#include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define sm_classwxFontDialog sm_classwxGenericFontDialog
 #elif defined(__WXSTUBS__)
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 329561fd9af050d8fb1758a15ea24817d7045c3a..89171ced45f6d03d8f714823ee5e88ebb55cb332 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -11,6 +11,8 @@
 #include "wx/qt/frame.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/frame.h"
+#elif defined(__WXPM__)
+#include "wx/os2/frame.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/frame.h"
 #endif

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index abf8a1f7e0bfd87f4e0756e62d285c0a75e56e11..cffbc7c0d7588be2df346b56042cbdeed4874b8a 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -11,6 +11,8 @@
 #include "wx/qt/gauge.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/gauge.h"
+#elif defined(__WXPM__)
+#include "wx/os2/gauge.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/gauge.h"
 #endif

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 0e197f0482cfe8ee380c128c63c60855ce7d4230..27ca11d85da1275e543bdcbc3f68aacf112a9ff8 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -131,6 +131,9 @@ enum wxStockCursor
 #ifdef __WXMSW__
     // Load from a resource
     #define wxICON(X) wxIcon("" #X "")
+#elif defined(__WXPM__)
+    // Load from a resource
+    #define wxICON(X) wxIcon("" #X "")
 #elif defined(__WXGTK__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( (const char**) X##_xpm )

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 39762ec74957333cc0c66b384e4277c057372d1c..4ab7c5ad812c0c36ef8c4c2e1050e615504261e2 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -11,6 +11,8 @@
 #include "wx/qt/gdiobj.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/gdiobj.h"
+#elif defined(__WXPM__)
+#include "wx/os2/gdiobj.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/gdiobj.h"
 #endif

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 4fa9b5d22500aca5fdbb55b5521aa9dd5d054d56..ee304c2b697602edbd334aeef88ef8f9a13c7436 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -17,6 +17,8 @@
   #include "wx/qt/icon.h"
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
+#elif defined(__WXPM__)
+  #include "wx/os2/icon.h"
 #elif defined(__WXSTUBS__)
   #include "wx/stubs/icon.h"
 #endif

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 7aa92ee1bf7f0bbec246891dbc3dd3a23e8ceb4a..32f5922bd764f0aed6e88fd048392f29fb5facdf 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -15,6 +15,8 @@
 #include "wx/generic/imaglist.h"
 #elif defined(__WXMAC__)
 #include "wx/generic/imaglist.h"
+#elif defined(__WXPM__)
+#include "wx/generic/imaglist.h"
 #elif defined(__WXSTUBS__)
 #include "wx/generic/imaglist.h"
 #endif

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 5391c9c5c349b222facf4f0b5897b34c62eb4d81..370ee935c69698f6eb3347f11774c2d5e04c12dc 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -9,6 +9,8 @@
 #include "wx/gtk/joystick.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/joystick.h"
+#elif defined(__WXPM__)
+#include "wx/os2/joystick.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/joystick.h"
 #endif

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 9d8a3460dbf9bff57cd5ec4ad2fa2cad2ca1d480..c104dbeabda47b5c39190d2b72315f93131a8195 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -11,6 +11,8 @@
 #include "wx/qt/listbox.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/listbox.h"
+#elif defined(__WXPM__)
+#include "wx/os2/listbox.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/listbox.h"
 #endif

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index f6fe64203afd02cddf8dd816944e9b5295e2d02c..087e5d1c2aa705ad6ad3035ff027515f115193a6 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -15,6 +15,8 @@
 #include "wx/generic/listctrl.h"
 #elif defined(__WXMAC__)
 #include "wx/generic/listctrl.h"
+#elif defined(__WXPM__)
+#include "wx/generic/listctrl.h"
 #elif defined(__WXSTUBS__)
 #include "wx/generic/listctrl.h"
 #endif

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 1ce5e5555c89bf6f43312503e6dab5a098901ceb..40d7abf66c5f8d68d63728ad923824ebcbcce7d5 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -11,6 +11,8 @@
 #include "wx/qt/mdi.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/mdi.h"
+#elif defined(__WXPM__)
+#include "wx/os2/mdi.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/mdi.h"
 #endif

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 2d0ce9798b171b079f0c4659c48d48bc5850aac5..eb6bc59c98752ee13f1fc405a6c75a23cdd26fc1 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -11,6 +11,8 @@
 #include "wx/qt/menu.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/menu.h"
+#elif defined(__WXPM__)
+#include "wx/os2/menu.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/menu.h"
 #endif

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index ffb693fe0c864fa5a82f9b3e83ea042e1f4127ad..c19c785ffeb14297df67b52ff0443841e3b3ce42 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -11,6 +11,8 @@
 #include "wx/qt/menuitem.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/menuitem.h"
+#elif defined(__WXPM__)
+#include "wx/os2/menuitem.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/menuitem.h"
 #endif

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index dab13f19f22c9d9a0d0041a24146a4d20f5ed63a..17aebfdcc8f1370463a36109e11092bdf548c20f 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -4,6 +4,9 @@
 #if defined(__WXMSW__)
 #include "wx/msw/metafile.h"
 #endif
+#if defined(__WXPM__)
+#include "wx/os2/metafile.h"
+#endif
 
 #endif
     // _WX_METAFILE_H_BASE_

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 3b45d33a526a65ae9834b74fce9d4a95a54b32bc..c8bd992496a395955fb0b394c815ffc7b96d71bd 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -9,6 +9,8 @@
 #include "wx/gtk/minifram.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/minifram.h"
+#elif defined(__WXPM__)
+#include "wx/os2/minifram.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/minifram.h"
 #endif

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index f03456aeaf83f5c3b06f993393a0d9f9815557b5..173e699e3609f8f78beb58537e94b3d3404f30b0 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -11,6 +11,8 @@
 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"
+#elif defined(__WXPM__)
+#include "wx/os2/msgdlg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/generic/msgdlgg.h"
 #endif

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 04fec2227f057e597897b06cf701ab2c9cc4d407..63bbee89ead8109b379af773f81db424b2a71db3 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -103,6 +103,8 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
   #include  "wx/qt/notebook.h"
 #elif defined(__WXMAC__)
   #include  "wx/mac/notebook.h"
+#elif defined(__WXPM__)
+  #include  "wx/os2/notebook.h"
 #elif defined(__WXSTUBS__)
   #include  "wx/stubs/notebook.h"
 #endif

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 9702d374a18c87c3c3121a26687dc990af4711a3..1c5099ee19530bab82a35ff5fc5e4b0e202cc1c5 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -11,6 +11,8 @@
 #include "wx/qt/palette.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/palette.h"
+#elif defined(__WXPM__)
+#include "wx/os2/palette.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/palette.h"
 #endif

diff --git a/include/wx/pen.h b/include/wx/pen.h
index d132d8a7c973c70a51f2ccae351a6eca795f3ec6..62bdd7dc6ed83ed24c27053fa47e9406a081eb6e 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -11,6 +11,8 @@
 #include "wx/qt/pen.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/pen.h"
+#elif defined(__WXPM__)
+#include "wx/os2/pen.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/pen.h"
 #endif

diff --git a/include/wx/pnghand.h b/include/wx/pnghand.h
index 405e234ba5c73c4e4a390bdae678c6b7ecb9deae..3e6089629c087fab3591b52afb8d00b86268c0cd 100644 (file)
--- a/include/wx/pnghand.h
+++ b/include/wx/pnghand.h
@@ -9,6 +9,8 @@
 #include "wx/gtk/pnghand.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/pnghand.h"
+#elif defined(__WXPM__)
+#include "wx/os2/pnghand.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/pnghand.h"
 #endif

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 59d382735ef3d079dcd4163af0aacd775fc3fc79..8a9480c622b74779c441947c327f4c0b2289d219 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -11,6 +11,8 @@
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/printdlg.h"
+#elif defined(__WXPM__)
+#include "wx/os2/printdlg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/generic/prntdlgg.h"
 #endif

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 2f0253ddb92a0cf59992ca8080f32798da5529d0..dc4b1df2abcf21ea435a4b22476e0437728d6033 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -11,6 +11,8 @@
 #include "wx/qt/radiobox.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/radiobox.h"
+#elif defined(__WXPM__)
+#include "wx/os2/radiobox.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/radiobox.h"
 #endif

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index ce602dcc0f408fe14ffb962f8be0ce85e9c40c1d..01023e4c1757fe96f9493abd6144560c85af788b 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -11,6 +11,8 @@
 #include "wx/qt/radiobut.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/radiobut.h"
+#elif defined(__WXPM__)
+#include "wx/os2/radiobut.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/radiobut.h"
 #endif

diff --git a/include/wx/region.h b/include/wx/region.h
index 9c5afd22bc8f97ddaeaef20ba59350088d085b50..ee0fd6ac06f761f0b054445a9a7057324db4082d 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -11,6 +11,8 @@
 #include "wx/qt/region.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/region.h"
+#elif defined(__WXPM__)
+#include "wx/os2/region.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/region.h"
 #endif

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index a330bb173fc8069a0a14f7b00740bac547639aa9..7e5159294ae9f819c6c170534a903dfb3618bdc9 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -56,7 +56,7 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream
 };
 
 class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
-                                  public wxSocketOutputStream
+                   public wxSocketOutputStream
 {
  public:
   wxSocketStream(wxSocketBase& s);

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 49f9a11b05cc997e82be386d76b745fa3e47ef15..301291e7b23ce116e42b4118da13f9ca1d03cbc4 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -11,6 +11,8 @@
 #include "wx/qt/scrolbar.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/scrolbar.h"
+#elif defined(__WXPM__)
+#include "wx/os2/scrolbar.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/scrolbar.h"
 #endif

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 1dfc5d9280c8ddb53a4cf04175b3a4a55446d5b2..0109917b1d70611f2556519a52c6c110ecfaad7d 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -114,6 +114,8 @@
 #include "wx/qt/settings.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/settings.h"
+#elif defined(__WXPM__)
+#include "wx/os2/settings.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/settings.h"
 #endif

diff --git a/include/wx/setup.h b/include/wx/setup.h
index 54936598ae78667efc1f9093ab10fa9e609bba11..076a4d4c78fa63135f1016627c35d6f2c1b1334c 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -4,8 +4,8 @@
 
 /* compatibility code, to be removed asap: */
 
-#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__)
-#    error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXSTUBS__
+#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
+#    error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
 #endif
 
 #if defined(__WXMSW__)
@@ -16,6 +16,8 @@
 #include "wx/qt/setup.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/setup.h"
+#elif defined(__WXPM__)
+#include "wx/os2/setup.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/setup.h"
 #elif defined(__WXGTK__)

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 739a311aa5aa527d0617a7548905f2253860301a..772c2e5db4f4caaa91358b747bf513824c66a3f9 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -11,6 +11,8 @@
 #include "wx/qt/slider.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/slider.h"
+#elif defined(__WXPM__)
+#include "wx/os2/slider.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/slider.h"
 #endif

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index b06df17a92911ccef4c2c74ea2aaefd2122e9dc3..4593894ca57e5431d1afe4187c2cdd902c32c298 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -79,6 +79,8 @@ protected:
     #include "wx/qt/spinbutt.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/spinbutt.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/spinbutt.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/spinbutt.h"
 #endif

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 0f32d687a359a9b252303a7558a955899be77f56..764a0fe7e3ae02c402b2322ef0dfdd74f0f90244 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -11,6 +11,8 @@
 #include "wx/qt/statbmp.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/statbmp.h"
+#elif defined(__WXPM__)
+#include "wx/os2/statbmp.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/statbmp.h"
 #endif

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index f1a8bd6eea3296a301004082acb8d884adf6bf5d..e67a1698e30689aa44517a8c36a1b3b8f826fa79 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -11,6 +11,8 @@
 #include "wx/qt/statbox.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/statbox.h"
+#elif defined(__WXPM__)
+#include "wx/os2/statbox.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/statbox.h"
 #endif

diff --git a/include/wx/statline.h b/include/wx/statline.h
index 9c7fe86788c1cedafbe8902ea9dbe265ddf2b3e2..956dc75a68e535ff495f70006b77dcf76a62f7f8 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -64,6 +64,8 @@ protected:
     #include "wx/msw/statline.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/statline.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/statline.h"
 #else // use generic implementation for all other platforms
     #include "wx/generic/statline.h"
 #endif

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index abfbbd5be6a582ca72bbb9dea437e027d252a202..48ea950c52faf057b91ce40cdbe86e30439604e5 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -11,6 +11,8 @@
 #include "wx/qt/stattext.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/stattext.h"
+#elif defined(__WXPM__)
+#include "wx/os2/stattext.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/stattext.h"
 #endif

diff --git a/include/wx/string.h b/include/wx/string.h
index 661c893f5759a526a5e493c5e4ffe3b239b0fab3..41e60cb3c0e30afa3d9803b265f8bc90cec6381f 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -105,6 +105,8 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
   return stricmp(psz1, psz2);
 #elif defined(__EMX__)
   return stricmp(psz1, psz2);
+#elif defined(__VISAGECPP__)
+  return stricmp(psz1, psz2);
 #elif defined(__UNIX__) || defined(__GNUWIN32__)
   return strcasecmp(psz1, psz2);
 #elif defined(__MWERKS__) && !defined(__INTEL__)

diff --git a/include/wx/tabctrl.h b/include/wx/tabctrl.h
index c766f72bf354b7ec91fa45ac09b7b9d960dc190b..baf3850a04f6585580d1838c06a8c1ebe9065ced 100644 (file)
--- a/include/wx/tabctrl.h
+++ b/include/wx/tabctrl.h
@@ -8,6 +8,8 @@
 #elif defined(__WXGTK__)
 #elif defined(__WXMAC__)
 #include "wx/mac/tabctrl.h"
+#elif defined(__WXPM__)
+#include "wx/os2/tabctrl.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/tabctrl.h"
 #endif

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 614edbb6556f8aafbc51fb1c111e1041c1a7efd9..3474858a655766de631a06921d7f10af4a6799e0 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -9,6 +9,8 @@
 #elif defined(__WXQT__)
 #elif defined(__WXMAC__)
 #include "wx/mac/taskbar.h"
+#elif defined(__WXPM__)
+#include "wx/os2/taskbar.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/taskbar.h"
 #endif

diff --git a/include/wx/tbar95.h b/include/wx/tbar95.h
index 5e1a009544cab2523c3a894406009c36c6edaaab..511220e2bdde04b5da8866aa2f9b6530e3a3fecc 100644 (file)
--- a/include/wx/tbar95.h
+++ b/include/wx/tbar95.h
@@ -7,6 +7,8 @@
 #include "wx/motif/tbar95.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/tbar95.h"
+#elif defined(__WXPM__)
+#include "wx/os2/tbar95.h"
 #endif
 
 #endif

diff --git a/include/wx/tbarmsw.h b/include/wx/tbarmsw.h
index 4b9d761fcfb87d08c63d71c4ddf318c5ace20271..b79f2200c651565b2ea420057c2ff4f7736fe528 100644 (file)
--- a/include/wx/tbarmsw.h
+++ b/include/wx/tbarmsw.h
@@ -7,6 +7,8 @@
 #include "wx/motif/tbarmsw.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/tbarmsw.h"
+#elif defined(__WXPM__)
+#include "wx/os2/tbarmsw.h"
 #endif
 
 #endif

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 0de57cdcf692831d393b6f6484327e1d4fdbf932..279d9160a85eb1474302f8b559d2714c0e2b1e43 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -172,6 +172,8 @@ private:
     #include "wx/qt/textctrl.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/textctrl.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/textctrl.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/textctrl.h"
 #endif

diff --git a/include/wx/thread.h b/include/wx/thread.h
index b0bbc261f714c080681bc255d6a75368c2456ad7..d4bb7aeac3efbb5ae17ec08d17cba59ea70dcc80 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -160,7 +160,7 @@ private:
     wxCriticalSection(const wxCriticalSection&);
     wxCriticalSection& operator=(const wxCriticalSection&);
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
     wxCriticalSectionInternal *m_critsect;
 #else // !MSW
     wxMutex m_mutex;
@@ -372,7 +372,7 @@ public:
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
 #if wxUSE_THREADS
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
     // unlock GUI if there are threads waiting for and lock it back when
     // there are no more of them - should be called periodically by the main
     // thread

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 4cf5c35b26226ea09768193bd3b8497152f7d118..0b86490de622ec5674f5e44ab9ea31603bd9700c 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -11,6 +11,8 @@
 #include "wx/qt/timer.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/timer.h"
+#elif defined(__WXPM__)
+#include "wx/os2/timer.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/timer.h"
 #endif

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 86d2444de77bffaf664ec84e8f2c2312605e470c..7dad6add567e2d0f612b6422e7b19267479a4106 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -19,6 +19,8 @@
 #   include "wx/qt/tbarqt.h"
 #elif defined(__WXMAC__)
 #   include "wx/mac/toolbar.h"
+#elif defined(__WXPM__)
+#   include "wx/os2/toolbar.h"
 #elif defined(__WXSTUBS__)
 #   include "wx/stubs/toolbar.h"
 #endif

diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index 451765c5e63edc0b353c8cf6553ce96143d1ec8d..017bed7de195181b66b3d79eff17c6395b698768 100644 (file)
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -11,6 +11,8 @@
 #include "wx/qt/tooltip.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/tooltip.h"
+#elif defined(__WXPM__)
+#include "wx/os2/tooltip.h"
 #elif defined(__WXSTUBS__)
 // #include "wx/stubs/tooltip.h"
 #endif

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 55642822d706328d14b24883f2e7c3538503d0bb..799425a95fe335cb6b22e91a25c42494af899f18 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -26,6 +26,8 @@
     #include "wx/qt/treectrl.h"
 #elif defined(__WXMAC__)
     #include "wx/generic/treectrl.h"
+#elif defined(__WXPM__)
+    #include "wx/generic/treectrl.h"
 #elif defined(__WXSTUBS__)
     #include "wx/generic/treectrl.h"
 #endif

diff --git a/include/wx/version.h b/include/wx/version.h
index 6d3d427b2ae180843d86138400cb020c6ad1c78f..e22c21138e7a7d59d7665ba65361508da56f2a2a 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -22,4 +22,4 @@
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif
-       // _WX_VERSIONH__
+// _WX_VERSIONH__

diff --git a/include/wx/wave.h b/include/wx/wave.h
index cd61bad81890d168556674d290fd24608e0740eb..f0756b1cdc914bdd2eab1b4c948e8b195b64f342 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -7,6 +7,8 @@
 #include "wx/gtk/wave.h"
 #elif defined(__WXQT__)
 #include "wx/qt/wave.h"
+#elif defined(__WXPM__)
+#include "wx/os2/wave.h"
 #endif
 
 #endif

diff --git a/include/wx/window.h b/include/wx/window.h
index d6ee431600660b87666ef8ef4314742e7272c93c..5ae7d448c94816b5c362001b8973fb3bf6c592d7 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -819,6 +819,8 @@ private:
     #include "wx/qt/window.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/window.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/window.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 7e05283622f938e02eac7612e84526894b1f43f1..9aac1f6a7b5dad96bbc84622d053edf7154bec77 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -18,131 +18,131 @@
 
 // only do SBCS or _UNICODE
 #if defined (_MBCS )
-#error "MBCS is not supported by wxChar"
+#  error "MBCS is not supported by wxChar"
 #endif
 
 // set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined
 #if defined(_UNICODE) || defined(UNICODE)
-#undef wxUSE_UNICODE
-#define wxUSE_UNICODE 1
+#  undef wxUSE_UNICODE
+#  define wxUSE_UNICODE 1
 #else
-#ifndef wxUSE_UNICODE
-#define wxUSE_UNICODE 0
-#endif
+#  ifndef wxUSE_UNICODE
+#    define wxUSE_UNICODE 0
+#  endif
 #endif
 
 // and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1...
 #if wxUSE_UNICODE
-#ifndef _UNICODE
-#define _UNICODE
-#endif
-#ifndef UNICODE
-#define UNICODE
-#endif
+#  ifndef _UNICODE
+#    define _UNICODE
+#  endif
+#  ifndef UNICODE
+#    define UNICODE
+#  endif
 #endif
 
 // Windows (VC++) has broad TCHAR support
 #if defined(__VISUALC__) && defined(__WIN32__)
 
-#define HAVE_WCSLEN 1
+#  define HAVE_WCSLEN 1
 
-#include <tchar.h>
-#if wxUSE_UNICODE // temporary - preserve binary compatibility
+#  include <tchar.h>
+#  if wxUSE_UNICODE // temporary - preserve binary compatibility
 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
 typedef  _TUCHAR     wxUChar;
-#else
-#define wxChar char
-#define wxSChar signed char
-#define wxUChar unsigned char
-#endif
+#  else
+#    define wxChar char
+#    define wxSChar signed char
+#    define wxUChar unsigned char
+#  endif
    // wchar_t is available
-#undef wxUSE_WCHAR_T
-#define wxUSE_WCHAR_T 1
+#  undef wxUSE_WCHAR_T
+#  define wxUSE_WCHAR_T 1
 
    // ctype.h functions
-#define  wxIsalnum   _istalnum
-#define  wxIsalpha   _istalpha
-#define  wxIsctrl    _istctrl
-#define  wxIsdigit   _istdigit
-#define  wxIsgraph   _istgraph
-#define  wxIslower   _istlower
-#define  wxIsprint   _istprint
-#define  wxIspunct   _istpunct
-#define  wxIsspace   _istspace
-#define  wxIsupper   _istupper
-#define  wxIsxdigit  _istxdigit
-#define  wxTolower   _totlower
-#define  wxToupper   _totupper
+#  define  wxIsalnum   _istalnum
+#  define  wxIsalpha   _istalpha
+#  define  wxIsctrl    _istctrl
+#  define  wxIsdigit   _istdigit
+#  define  wxIsgraph   _istgraph
+#  define  wxIslower   _istlower
+#  define  wxIsprint   _istprint
+#  define  wxIspunct   _istpunct
+#  define  wxIsspace   _istspace
+#  define  wxIsupper   _istupper
+#  define  wxIsxdigit  _istxdigit
+#  define  wxTolower   _totlower
+#  define  wxToupper   _totupper
 
    // locale.h functons
-#define  wxSetlocale _tsetlocale
+#  define  wxSetlocale _tsetlocale
 
    // string.h functions
-#define  wxStrcat    _tcscat
-#define  wxStrchr    _tcschr
-#define  wxStrcmp    _tcscmp
-#define  wxStrcoll   _tcscoll
-#define  wxStrcpy    _tcscpy
-#define  wxStrcspn   _tcscspn
-#define  wxStrftime  _tcsftime
-#define  wxStricmp   _tcsicmp
-#define  wxStrlen_   _tcslen // used in wxStrlen inline function
-#define  wxStrncat   _tcsncat
-#define  wxStrncmp   _tcsncmp
-#define  wxStrncpy   _tcsncpy
-#define  wxStrpbrk   _tcspbrk
-#define  wxStrrchr   _tcsrchr
-#define  wxStrspn    _tcsspn
-#define  wxStrstr    _tcsstr
-#define  wxStrtod    _tcstod
+#  define  wxStrcat    _tcscat
+#  define  wxStrchr    _tcschr
+#  define  wxStrcmp    _tcscmp
+#  define  wxStrcoll   _tcscoll
+#  define  wxStrcpy    _tcscpy
+#  define  wxStrcspn   _tcscspn
+#  define  wxStrftime  _tcsftime
+#  define  wxStricmp   _tcsicmp
+#  define  wxStrlen_   _tcslen // used in wxStrlen inline function
+#  define  wxStrncat   _tcsncat
+#  define  wxStrncmp   _tcsncmp
+#  define  wxStrncpy   _tcsncpy
+#  define  wxStrpbrk   _tcspbrk
+#  define  wxStrrchr   _tcsrchr
+#  define  wxStrspn    _tcsspn
+#  define  wxStrstr    _tcsstr
+#  define  wxStrtod    _tcstod
 // is there a _tcstok[_r] ?
-#define  wxStrtol    _tcstol
-#define  wxStrtoul   _tcstoul
-#define  wxStrxfrm   _tcsxfrm
+#  define  wxStrtol    _tcstol
+#  define  wxStrtoul   _tcstoul
+#  define  wxStrxfrm   _tcsxfrm
 
    // stdio.h functions
-#define  wxFgetc     _fgettc
-#define  wxFgetchar  _fgettchar
-#define  wxFgets     _fgetts
-#define  wxFopen     _tfopen
-#define  wxFputc     _fputtc
-#define  wxFputchar  _fputtchar
-#define  wxFprintf   _ftprintf
-#define  wxFreopen   _tfreopen
-#define  wxFscanf    _ftscanf
-#define  wxGetc      _gettc
-#define  wxGetchar   _gettchar
-#define  wxGets      _getts
-#define  wxPerror    _tperror
-#define  wxPrintf    _tprintf
-#define  wxPutc      _puttc
-#define  wxPutchar   _puttchar
-#define  wxPuts      _putts
-#define  wxRemove    _tremove
-#define  wxRename    _trename
-#define  wxScanf     _tscanf
-#define  wxSprintf   _stprintf
-#define  wxSscanf    _stscanf
-#define  wxTmpnam    _ttmpnam
-#define  wxUngetc    _tungetc
-#define  wxVfprint   _vftprintf
-#define  wxVprintf   _vtprintf
-#define  wxVsscanf   _vstscanf
-#define  wxVsprintf  _vstprintf
+#  define  wxFgetc     _fgettc
+#  define  wxFgetchar  _fgettchar
+#  define  wxFgets     _fgetts
+#  define  wxFopen     _tfopen
+#  define  wxFputc     _fputtc
+#  define  wxFputchar  _fputtchar
+#  define  wxFprintf   _ftprintf
+#  define  wxFreopen   _tfreopen
+#  define  wxFscanf    _ftscanf
+#  define  wxGetc      _gettc
+#  define  wxGetchar   _gettchar
+#  define  wxGets      _getts
+#  define  wxPerror    _tperror
+#  define  wxPrintf    _tprintf
+#  define  wxPutc      _puttc
+#  define  wxPutchar   _puttchar
+#  define  wxPuts      _putts
+#  define  wxRemove    _tremove
+#  define  wxRename    _trename
+#  define  wxScanf     _tscanf
+#  define  wxSprintf   _stprintf
+#  define  wxSscanf    _stscanf
+#  define  wxTmpnam    _ttmpnam
+#  define  wxUngetc    _tungetc
+#  define  wxVfprint   _vftprintf
+#  define  wxVprintf   _vtprintf
+#  define  wxVsscanf   _vstscanf
+#  define  wxVsprintf  _vstprintf
 
    // stdlib.h functions
-#if !wxUSE_UNICODE
-#define  wxAtof      atof
-#endif
-#define  wxAtoi      _ttoi
-#define  wxAtol      _ttol
-#define  wxGetenv    _tgetenv
-#define  wxSystem    _tsystem
+#  if !wxUSE_UNICODE
+#    define  wxAtof      atof
+#  endif
+#  define  wxAtoi      _ttoi
+#  define  wxAtol      _ttol
+#  define  wxGetenv    _tgetenv
+#  define  wxSystem    _tsystem
 
    // time.h functions
-#define  wxAsctime   _tasctime
-#define  wxCtime     _tctime
+#  define  wxAsctime   _tasctime
+#  define  wxCtime     _tctime
 
 // #elif defined(XXX)
    // #include XXX-specific files here
@@ -156,281 +156,281 @@ typedef  _TUCHAR     wxUChar;
 // maybe Borland C++ 5.02 has, can't check right now
 // but I'll use the Win32 API instead here
 
-#include <tchar.h>
-#if wxUSE_UNICODE // temporary - preserve binary compatibility
+#  include <tchar.h>
+#  if wxUSE_UNICODE // temporary - preserve binary compatibility
 typedef  _TCHAR      wxChar;
 typedef  _TSCHAR     wxSChar;
 typedef  _TUCHAR     wxUChar;
-#else
-#define wxChar char
-#define wxSChar signed char
-#define wxUChar unsigned char
-#endif
+#  else
+#    define wxChar char
+#    define wxSChar signed char
+#    define wxUChar unsigned char
+#  endif
    // wchar_t is available
-#undef wxUSE_WCHAR_T
-#define wxUSE_WCHAR_T 1
+#  undef wxUSE_WCHAR_T
+#  define wxUSE_WCHAR_T 1
 
-#define wxNEED_WX_CTYPE_H
+#  define wxNEED_WX_CTYPE_H
 // #define  wxStrtok    strtok_r // Borland C++ 4.52 doesn't have strtok_r
-#define wxNEED_WX_STRING_H
-#define wxNEED_WX_STDIO_H
-#define wxNEED_WX_STDLIB_H
-#define wxNEED_WX_TIME_H
-#define wxNEED_WCSLEN
+#  define wxNEED_WX_STRING_H
+#  define wxNEED_WX_STDIO_H
+#  define wxNEED_WX_STDLIB_H
+#  define wxNEED_WX_TIME_H
+#  define wxNEED_WCSLEN
 
 #else//!TCHAR-aware compilers
 
 // check whether we should include wchar.h or equivalent
-#if wxUSE_UNICODE
- #undef wxUSE_WCHAR_T
- #define wxUSE_WCHAR_T 1 // wchar_t *must* be available in Unicode mode
-#elif !defined(wxUSE_WCHAR_T)
- #if defined(__VISUALC__) && (__VISUALC__ < 900)
-  #define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
- #elif defined(__UNIX__)
-  #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__)
-   #define wxUSE_WCHAR_T 1
-  #else
-   #define wxUSE_WCHAR_T 0
-  #endif
- #elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h
-  #define wxUSE_WCHAR_T 0
- #elif defined(__BORLANDC__) // WIN16 BC++
-  #define wxUSE_WCHAR_T 0
- #elif defined(__WATCOMC__)
-  #define wxUSE_WCHAR_T 0
- #else
+#  if wxUSE_UNICODE
+#    undef wxUSE_WCHAR_T
+#    define wxUSE_WCHAR_T 1 // wchar_t *must* be available in Unicode mode
+#  elif !defined(wxUSE_WCHAR_T)
+#    if defined(__VISUALC__) && (__VISUALC__ < 900)
+#      define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
+#    elif defined(__UNIX__)
+#      if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__)
+#        define wxUSE_WCHAR_T 1
+#      else
+#        define wxUSE_WCHAR_T 0
+#      endif
+#    elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h
+#      define wxUSE_WCHAR_T 0
+#    elif defined(__BORLANDC__) // WIN16 BC++
+#      define wxUSE_WCHAR_T 0
+#    elif defined(__WATCOMC__)
+#      define wxUSE_WCHAR_T 0
+#    else
   // add additional compiler checks if this fails
-  #define wxUSE_WCHAR_T 1
- #endif
-#endif//wxUSE_UNICODE
-
-#if wxUSE_WCHAR_T
- #ifdef HAVE_WCSTR_H
-  #include <wcstr.h>
- #else
-  #ifndef __FreeBSD__
-   #include <wchar.h>
-  #else
-   #include <stdlib.h>
-   #define wxNEED_WCSLEN
-  #endif
- #endif
-#endif
+#      define wxUSE_WCHAR_T 1
+#    endif
+#  endif//wxUSE_UNICODE
+
+#  if wxUSE_WCHAR_T
+#    ifdef HAVE_WCSTR_H
+#      include <wcstr.h>
+#    else
+#      ifndef __FreeBSD__
+#        include <wchar.h>
+#      else
+#        include <stdlib.h>
+#        define wxNEED_WCSLEN
+#      endif
+#    endif
+#  endif
 
 // check whether we are doing Unicode
-#if wxUSE_UNICODE
+#  if wxUSE_UNICODE
 
-#include <wctype.h>
+#    include <wctype.h>
 
 // this is probably glibc-specific
-#if defined(__WCHAR_TYPE__)
+#    if defined(__WCHAR_TYPE__)
 
 typedef __WCHAR_TYPE__          wxChar;
 typedef signed __WCHAR_TYPE__   wxSChar;
 typedef unsigned __WCHAR_TYPE__ wxUChar;
 
-#define _T(x)                   L##x
-
-   // ctype.h functions (wctype.h)
-#define  wxIsalnum   iswalnum
-#define  wxIsalpha   iswalpha
-#define  wxIsctrl    iswcntrl
-#define  wxIsdigit   iswdigit
-#define  wxIsgraph   iswgraph
-#define  wxIslower   iswlower
-#define  wxIsprint   iswprint
-#define  wxIspunct   iswpunct
-#define  wxIsspace   iswspace
-#define  wxIsupper   iswupper
-#define  wxIsxdigit  iswxdigit
-
-#if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)
-    // /usr/include/wctype.h incorrectly declares translations tables which
-    // provokes tons of compile-time warnings - try to correct this
-    #define  wxTolower(wc)   towctrans((wc), (wctrans_t)__ctype_tolower)
-    #define  wxToupper(wc)   towctrans((wc), (wctrans_t)__ctype_toupper)
-#else
-    #define  wxTolower   towlower
-    #define  wxToupper   towupper
-#endif // gcc/!gcc
-
-   // string.h functions (wchar.h)
-#define  wxStrcat    wcscat
-#define  wxStrchr    wcschr
-#define  wxStrcmp    wcscmp
-#define  wxStrcoll   wcscoll
-#define  wxStrcpy    wcscpy
-#define  wxStrcspn   wcscspn
-#define  wxStrlen_   wcslen // used in wxStrlen inline function
-#define  wxStrncat   wcsncat
-#define  wxStrncmp   wcsncmp
-#define  wxStrncpy   wcsncpy
-#define  wxStrpbrk   wcspbrk
-#define  wxStrrchr   wcsrchr
-#define  wxStrspn    wcsspn
-#define  wxStrstr    wcsstr
-#define  wxStrtod    wcstod
-#define  wxStrtok    wcstok
-#define  wxStrtol    wcstol
-#define  wxStrtoul   wcstoul
-#define  wxStrxfrm   wcsxfrm
+#      define _T(x)                   L##x
+
+       // ctype.h functions (wctype.h)
+#      define  wxIsalnum   iswalnum
+#      define  wxIsalpha   iswalpha
+#      define  wxIsctrl    iswcntrl
+#      define  wxIsdigit   iswdigit
+#      define  wxIsgraph   iswgraph
+#      define  wxIslower   iswlower
+#      define  wxIsprint   iswprint
+#      define  wxIspunct   iswpunct
+#      define  wxIsspace   iswspace
+#      define  wxIsupper   iswupper
+#      define  wxIsxdigit  iswxdigit
+
+#      if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)
+       // /usr/include/wctype.h incorrectly declares translations tables which
+       // provokes tons of compile-time warnings - try to correct this
+#        define  wxTolower(wc)   towctrans((wc), (wctrans_t)__ctype_tolower)
+#        define  wxToupper(wc)   towctrans((wc), (wctrans_t)__ctype_toupper)
+#      else
+#        define  wxTolower   towlower
+#        define  wxToupper   towupper
+#      endif // gcc/!gcc
+
+       // string.h functions (wchar.h)
+#      define  wxStrcat    wcscat
+#      define  wxStrchr    wcschr
+#      define  wxStrcmp    wcscmp
+#      define  wxStrcoll   wcscoll
+#      define  wxStrcpy    wcscpy
+#      define  wxStrcspn   wcscspn
+#      define  wxStrlen_   wcslen // used in wxStrlen inline function
+#      define  wxStrncat   wcsncat
+#      define  wxStrncmp   wcsncmp
+#      define  wxStrncpy   wcsncpy
+#      define  wxStrpbrk   wcspbrk
+#      define  wxStrrchr   wcsrchr
+#      define  wxStrspn    wcsspn
+#      define  wxStrstr    wcsstr
+#      define  wxStrtod    wcstod
+#      define  wxStrtok    wcstok
+#      define  wxStrtol    wcstol
+#      define  wxStrtoul   wcstoul
+#      define  wxStrxfrm   wcsxfrm
 
 // glibc doesn't have wc equivalents of the other stuff
-#define wxNEED_WX_STDIO_H
-#define wxNEED_WX_STDLIB_H
-#define wxNEED_WX_TIME_H
+#      define wxNEED_WX_STDIO_H
+#      define wxNEED_WX_STDLIB_H
+#      define wxNEED_WX_TIME_H
 
-#else//!glibc
-#error   "Please define your compiler's Unicode conventions in wxChar.h"
-#endif
-#else//!Unicode
+#    else//!glibc
+#      error   "Please define your compiler's Unicode conventions in wxChar.h"
+#    endif
+#  else//!Unicode
 
-#include <ctype.h>
-#include <string.h>
+#    include <ctype.h>
+#    include <string.h>
 
-#if 0 // temporary - preserve binary compatibilty
+#    if 0 // temporary - preserve binary compatibilty
 typedef char            wxChar;
 typedef signed char     wxSChar;
 typedef unsigned char   wxUChar;
-#else
-#define wxChar char
-#define wxSChar signed char
-#define wxUChar unsigned char
-#endif
-
-#ifdef __FreeBSD__
- #undef _T
-#endif
-#define _T(x)           x
-
-   // ctype.h functions
-#define  wxIsalnum   isalnum
-#define  wxIsalpha   isalpha
-#define  wxIsctrl    isctrl
-#define  wxIsdigit   isdigit
-#define  wxIsgraph   isgraph
-#define  wxIslower   islower
-#define  wxIsprint   isprint
-#define  wxIspunct   ispunct
-#define  wxIsspace   isspace
-#define  wxIsupper   isupper
-#define  wxIsxdigit  isxdigit
-#define  wxTolower   tolower
-#define  wxToupper   toupper
-
-   // locale.h functons
-#define  wxSetlocale setlocale
-
-   // string.h functions
-// #define  wxStricmp   strcasecmp
-// wxStricmp is defined below!!
-
-// #define  wxStrtok    strtok_r // this needs a configure check
-
-   // leave the rest to defaults below
-#define wxNEED_WX_STRING_H
-#define wxNEED_WX_STDIO_H
-#define wxNEED_WX_STDLIB_H
-#define wxNEED_WX_TIME_H
-
-#endif//Unicode
+#    else
+#      define wxChar char
+#      define wxSChar signed char
+#      define wxUChar unsigned char
+#    endif
+
+#    ifdef __FreeBSD__
+#      undef _T
+#    endif
+#    define _T(x)           x
+
+     // ctype.h functions
+#    define  wxIsalnum   isalnum
+#    define  wxIsalpha   isalpha
+#    define  wxIsctrl    isctrl
+#    define  wxIsdigit   isdigit
+#    define  wxIsgraph   isgraph
+#    define  wxIslower   islower
+#    define  wxIsprint   isprint
+#    define  wxIspunct   ispunct
+#    define  wxIsspace   isspace
+#    define  wxIsupper   isupper
+#    define  wxIsxdigit  isxdigit
+#    define  wxTolower   tolower
+#    define  wxToupper   toupper
+
+     // locale.h functons
+#    define  wxSetlocale setlocale
+
+     // string.h functions
+     // #define  wxStricmp   strcasecmp
+     // wxStricmp is defined below!!
+
+     // #define  wxStrtok    strtok_r // this needs a configure check
+
+     // leave the rest to defaults below
+#    define wxNEED_WX_STRING_H
+#    define wxNEED_WX_STDIO_H
+#    define wxNEED_WX_STDLIB_H
+#    define wxNEED_WX_TIME_H
+
+#  endif//Unicode
 #endif//TCHAR-aware compilers
 
 // define wxStricmp for various compilers without Unicode possibilities
 #if !defined(wxStricmp) && !wxUSE_UNICODE
-#if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__)
-    #define wxStricmp stricmp
-#elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS) && defined(__INTEL__))
-    #define wxStricmp _stricmp
-#elif defined(__UNIX__) || defined(__GNUWIN32__)
-    #define wxStricmp strcasecmp
-#elif defined(__MWERKS__) && !defined(__INTEL__)
-    // use wxWindows' implementation
-#else
-    // if you leave wxStricmp undefined, wxWindows' implementation will be used
-    #error  "Please define string case-insensitive compare for your OS/compiler"
-#endif
+#  if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__)
+#    define wxStricmp stricmp
+#  elif defined(__SC__) || defined(__VISUALC__) || defined(__VISAGECPP__) || (defined(__MWERKS) && defined(__INTEL__))
+#    define wxStricmp _stricmp
+#  elif defined(__UNIX__) || defined(__GNUWIN32__)
+#    define wxStricmp strcasecmp
+#  elif defined(__MWERKS__) && !defined(__INTEL__)
+     // use wxWindows' implementation
+#  else
+     // if you leave wxStricmp undefined, wxWindows' implementation will be used
+#    error  "Please define string case-insensitive compare for your OS/compiler"
+#  endif
 #endif
 
 // if we need to define for standard headers, and we're not using Unicode,
 // just define to standard C library routines
 #if !wxUSE_UNICODE
-#ifdef wxNEED_WX_STRING_H
-#define  wxStrcat    strcat
-#define  wxStrchr    strchr
-#define  wxStrcmp    strcmp
-#define  wxStrcoll   strcoll
-#define  wxStrcpy    strcpy
-#define  wxStrcspn   strcspn
-#define  wxStrdup    strdup
-#define  wxStrlen_   strlen // used in wxStrlen inline function
-#define  wxStrncat   strncat
-#define  wxStrncmp   strncmp
-#define  wxStrncpy   strncpy
-#define  wxStrpbrk   strpbrk
-#define  wxStrrchr   strrchr
-#define  wxStrspn    strspn
-#define  wxStrstr    strstr
-#define  wxStrtod    strtod
-#define  wxStrtol    strtol
-#define  wxStrtoul   strtoul
-#define  wxStrxfrm   strxfrm
-#undef wxNEED_WX_STRING_H
-#endif
-
-#ifdef wxNEED_WX_STDIO_H
-#define  wxFgetc     fgetc
-#define  wxFgetchar  fgetchar
-#define  wxFgets     fgets
-#define  wxFopen     fopen
-#define  wxFputc     fputc
-#define  wxFputchar  fputchar
-#define  wxFprintf   fprintf
-#define  wxFreopen   freopen
-#define  wxFscanf    fscanf
-#define  wxGetc      getc
-#define  wxGetchar   getchar
-#define  wxGets      gets
-#define  wxPerror    perror
-#define  wxPrintf    printf
-#define  wxPutc      putc
-#define  wxPutchar   putchar
-#define  wxPuts      puts
-#define  wxRemove    remove
-#define  wxRename    rename
-#define  wxScanf     scanf
-#define  wxSprintf   sprintf
-#define  wxSscanf    sscanf
-#define  wxTmpnam    tmpnam
-#define  wxUngetc    ungetc
-#define  wxVfprint   vfprintf
-#define  wxVprintf   vprintf
-#define  wxVsscanf   vsscanf
-#define  wxVsprintf  vsprintf
-#undef wxNEED_WX_STDIO_H
-#endif
-
-#ifdef wxNEED_WX_STDLIB_H
-#define  wxAtof      atof
-#define  wxAtoi      atoi
-#define  wxAtol      atol
-#define  wxGetenv    getenv
-#define  wxSystem    system
-#undef wxNEED_WX_STDLIB_H
-#endif
-
-#ifdef wxNEED_WX_TIME_H
-#define  wxAsctime   asctime
-#define  wxCtime     ctime
-#define  wxStrftime  strftime
-#undef wxNEED_WX_TIME_H
-#endif
+#  ifdef wxNEED_WX_STRING_H
+#    define  wxStrcat    strcat
+#    define  wxStrchr    strchr
+#    define  wxStrcmp    strcmp
+#    define  wxStrcoll   strcoll
+#    define  wxStrcpy    strcpy
+#    define  wxStrcspn   strcspn
+#    define  wxStrdup    strdup
+#    define  wxStrlen_   strlen // used in wxStrlen inline function
+#    define  wxStrncat   strncat
+#    define  wxStrncmp   strncmp
+#    define  wxStrncpy   strncpy
+#    define  wxStrpbrk   strpbrk
+#    define  wxStrrchr   strrchr
+#    define  wxStrspn    strspn
+#    define  wxStrstr    strstr
+#    define  wxStrtod    strtod
+#    define  wxStrtol    strtol
+#    define  wxStrtoul   strtoul
+#    define  wxStrxfrm   strxfrm
+#    undef wxNEED_WX_STRING_H
+#  endif
+
+#  ifdef wxNEED_WX_STDIO_H
+#    define  wxFgetc     fgetc
+#    define  wxFgetchar  fgetchar
+#    define  wxFgets     fgets
+#    define  wxFopen     fopen
+#    define  wxFputc     fputc
+#    define  wxFputchar  fputchar
+#    define  wxFprintf   fprintf
+#    define  wxFreopen   freopen
+#    define  wxFscanf    fscanf
+#    define  wxGetc      getc
+#    define  wxGetchar   getchar
+#    define  wxGets      gets
+#    define  wxPerror    perror
+#    define  wxPrintf    printf
+#    define  wxPutc      putc
+#    define  wxPutchar   putchar
+#    define  wxPuts      puts
+#    define  wxRemove    remove
+#    define  wxRename    rename
+#    define  wxScanf     scanf
+#    define  wxSprintf   sprintf
+#    define  wxSscanf    sscanf
+#    define  wxTmpnam    tmpnam
+#    define  wxUngetc    ungetc
+#    define  wxVfprint   vfprintf
+#    define  wxVprintf   vprintf
+#    define  wxVsscanf   vsscanf
+#    define  wxVsprintf  vsprintf
+#    undef wxNEED_WX_STDIO_H
+#  endif
+
+#  ifdef wxNEED_WX_STDLIB_H
+#    define  wxAtof      atof
+#    define  wxAtoi      atoi
+#    define  wxAtol      atol
+#    define  wxGetenv    getenv
+#    define  wxSystem    system
+#    undef wxNEED_WX_STDLIB_H
+#  endif
+
+#  ifdef wxNEED_WX_TIME_H
+#    define  wxAsctime   asctime
+#    define  wxCtime     ctime
+#    define  wxStrftime  strftime
+#    undef wxNEED_WX_TIME_H
+#  endif
 #endif //!Unicode
 
 #if defined(wxNEED_WCSLEN) && wxUSE_UNICODE
-#define wcslen wxStrlen
-#undef wxNEED_WCSLEN
+#  define wcslen wxStrlen
+#  undef wxNEED_WCSLEN
 #endif
 
 /// checks whether the passed in pointer is NULL and if the string is empty
@@ -446,25 +446,25 @@ WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
 // multibyte<->widechar conversion
 WXDLLEXPORT size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
 WXDLLEXPORT size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
-#if wxUSE_UNICODE
-#define wxMB2WX wxMB2WC
-#define wxWX2MB wxWC2MB
-#define wxWC2WX wxStrncpy
-#define wxWX2WC wxStrncpy
-#else
-#define wxMB2WX wxStrncpy
-#define wxWX2MB wxStrncpy
-#define wxWC2WX wxWC2MB
-#define wxWX2WC wxMB2WC
-#endif
+#  if wxUSE_UNICODE
+#    define wxMB2WX wxMB2WC
+#    define wxWX2MB wxWC2MB
+#    define wxWC2WX wxStrncpy
+#    define wxWX2WC wxStrncpy
+#  else
+#    define wxMB2WX wxStrncpy
+#    define wxWX2MB wxStrncpy
+#    define wxWC2WX wxWC2MB
+#    define wxWX2WC wxMB2WC
+#  endif
 #else
 // No wxUSE_WCHAR_T: we have to do something (JACS)
-#define wxMB2WC wxStrncpy
-#define wxWC2MB wxStrncpy
-#define wxMB2WX wxStrncpy
-#define wxWX2MB wxStrncpy
-#define wxWC2WX wxWC2MB
-#define wxWX2WC wxMB2WC
+#  define wxMB2WC wxStrncpy
+#  define wxWC2MB wxStrncpy
+#  define wxMB2WX wxStrncpy
+#  define wxWX2MB wxStrncpy
+#  define wxWC2WX wxWC2MB
+#  define wxWX2WC wxMB2WC
 #endif
 
 WXDLLEXPORT bool wxOKlibc(); // for internal use
@@ -528,8 +528,8 @@ WXDLLEXPORT size_t   wxStrxfrm(wxChar *dest, const wxChar *src, size_t n);
 #endif
 
 #ifdef wxNEED_WX_STDIO_H
-#include <stdio.h>
-#include <stdarg.h>
+#  include <stdio.h>
+#  include <stdarg.h>
 WXDLLEXPORT FILE *   wxFopen(const wxChar *path, const wxChar *mode);
 WXDLLEXPORT FILE *   wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);
 WXDLLEXPORT int      wxPrintf(const wxChar *fmt, ...);
@@ -559,3 +559,4 @@ WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const
 
 #endif
   //_WX_WXCHAR_H_
+

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 80526f249bf110638b7006969d24fd844e1f096e..c79a641ffef0ffb328d1cc7621e666a708b32a88 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -13,7 +13,7 @@
 #include "wx/defs.h"    // compiler definitions
 
 // check if to use precompiled headers
-#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
+#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__WXPM__)
     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif
@@ -32,6 +32,11 @@
 #include "wx/msw/winundef.h"
 #endif
 
+#ifdef __WXPM__
+#define INCL_OS2
+#include <os2.h>
+#endif
+
 #include "wx/wx.h"
 
 

diff --git a/include/wx/xpmhand.h b/include/wx/xpmhand.h
index 9a848a0f8ccde1af422a241573454bb99eec6ebd..0d1a9bd10e058d050dc46030629c75fad250fd13 100644 (file)
--- a/include/wx/xpmhand.h
+++ b/include/wx/xpmhand.h
@@ -1,11 +1,14 @@
 #ifndef _WX_XPMHAND_H_BASE_
 #define _WX_XPMHAND_H_BASE_
 
-// Only wxMSW currently defines a separate XPM handler, since
-// mostly Windows apps won't need XPMs.
+// Only wxMSW and wxPM currently defines a separate XPM handler, since
+// mostly Windows and Presentation Manager apps won't need XPMs.
 #if defined(__WXMSW__)
 #include "wx/msw/xpmhand.h"
 #endif
+#if defined(__WXPM__)
+#include "wx/os2/xpmhand.h"
+#endif
 
 #endif
     // _WX_XPMHAND_H_BASE_