*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-07-28 03:38:12 +00:00
parent 2259e00789
commit 1777b9bbf4
84 changed files with 546 additions and 350 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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_
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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 )
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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_
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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__)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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__)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

 // ----------------------------------------------------------------------------
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -341,7 +341,7 @@ typedef unsigned char   wxUChar;
 #if !defined(wxStricmp) && !wxUSE_UNICODE
 #  if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__)
 #    define wxStricmp stricmp
-#elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS) && defined(__INTEL__))
+#  elif defined(__SC__) || defined(__VISUALC__) || defined(__VISAGECPP__) || (defined(__MWERKS) && defined(__INTEL__))
 #    define wxStricmp _stricmp
 #  elif defined(__UNIX__) || defined(__GNUWIN32__)
 #    define wxStricmp strcasecmp
@@ -559,3 +559,4 @@ WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const

 #endif
  //_WX_WXCHAR_H_
+
--- 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"


--- 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_