From d7e1a3227440c2910124edfc8896bbe23d6d0ab3 Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Tue, 24 Oct 2000 21:46:49 +0000
Subject: [PATCH] OS/2 updates for debugging and statusbar processing

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/os2/dc.h       | 11 +++++++++--
 include/wx/os2/dcclient.h |  2 --
 include/wx/os2/fontdlg.h  |  2 +-
 include/wx/os2/helpwin.h  |  6 +++++-
 include/wx/os2/setup.h    |  6 ++++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index d54d3f4488..debf4df06b 100644
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -13,7 +13,7 @@
 #define _WX_DC_H_
 
 #include "wx/defs.h"
-#include "wx/dc.h"
+//#include "wx/dc.h"
 
 // ---------------------------------------------------------------------------
 // macros
@@ -72,7 +72,7 @@ class WXDLLEXPORT wxDC : public wxDCBase
     DECLARE_DYNAMIC_CLASS(wxDC)
 
 public:
-    wxDC();
+    wxDC(void);
     ~wxDC();
 
     // implement base class pure virtuals
@@ -303,6 +303,13 @@ protected:
     wxWindow*                       m_pCanvas;
     wxBitmap                        m_vSelectedBitmap;
 
+public:
+    // PM specific stuff
+    HPS                             m_hPS;
+    HPS                             m_hOldPS;   // old hPS, if any
+    bool                            m_bIsPaintTime;// True at Paint Time
+
+    RECTL                           m_vRclPaint; // Bounding rectangle at Paint time etc.
     //
     // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
     //
diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index e7219e22c1..cffa9e5558 100644
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -44,8 +44,6 @@ public:
 
     virtual ~wxWindowDC();
 
-    // PM specific stuff
-    HPS                     m_hPS;
 private:
     HAB                     m_hab;
     SIZEL                   m_PageSize;
diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h
index b13df60ddb..510641744c 100644
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -32,7 +32,7 @@ public:
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }
 
-protected:
+//EK protected:
     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;
 };
diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h
index ab87cf1f5b..8970ab8a47 100644
--- a/include/wx/os2/helpwin.h
+++ b/include/wx/os2/helpwin.h
@@ -12,7 +12,9 @@
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
-#include "wx/wx.h"
+//EK #include "wx/wx.h"
+
+#if wxUSE_HELP
 
 #include "wx/helpbase.h"
 
@@ -47,5 +49,7 @@ private:
     bool DisplaySection(const wxString& rSection) { return wxHelpControllerBase::DisplaySection(rSection); }
 };
 
+#endif //wxUSE_HELP
+
 #endif
     // _WX_HELPWIN_H_
diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index c3af84e11c..ee6d18b1bc 100644
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -15,6 +15,12 @@
 // ----------------------------------------------------------------------------
 // global settings
 // ----------------------------------------------------------------------------
+// use TCPV40 from toolkit - EK
+#define TCPV40HDRS
+
+// use double mode + PM GUI and Window text window,
+// to use it you must link your app as "Window"
+#define wxUSE_CONSOLEDEBUG   1
 
 // define this to 1 if you want icons to behave as bitmaps
 #define wxICON_IS_BITMAP     0
-- 
2.45.2