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

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index d54d3f44889618930a7dfb68afc8cba9dbea2e9a..debf4df06b5b6c97a0bb44f3b60098e0d03ddbc2 100644 (file)
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -13,7 +13,7 @@
 #define _WX_DC_H_
 
 #include "wx/defs.h"
 #define _WX_DC_H_
 
 #include "wx/defs.h"

-#include "wx/dc.h"
+//#include "wx/dc.h"

 
 // ---------------------------------------------------------------------------
 // macros
 
 // ---------------------------------------------------------------------------
 // macros


@@ -72,7 +72,7 @@ class WXDLLEXPORT wxDC : public wxDCBase
     DECLARE_DYNAMIC_CLASS(wxDC)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxDC)
 
 public:

-    wxDC();
+    wxDC(void);

     ~wxDC();
 
     // implement base class pure virtuals
     ~wxDC();
 
     // implement base class pure virtuals


@@ -303,6 +303,13 @@ protected:
     wxWindow*                       m_pCanvas;
     wxBitmap                        m_vSelectedBitmap;
 
     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
     //
     //
     // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
     //

diff --git a/include/wx/os2/dcclient.h b/include/wx/os2/dcclient.h
index e7219e22c1b7a8fd2223456664bc9d6d9e6640ac..cffa9e555826f6eae51080fbaebe8ee6f0ee35c0 100644 (file)
--- a/include/wx/os2/dcclient.h
+++ b/include/wx/os2/dcclient.h
@@ -44,8 +44,6 @@ public:
 
     virtual ~wxWindowDC();
 
 
     virtual ~wxWindowDC();
 

-    // PM specific stuff
-    HPS                     m_hPS;

 private:
     HAB                     m_hab;
     SIZEL                   m_PageSize;
 private:
     HAB                     m_hab;
     SIZEL                   m_PageSize;

diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h
index b13df60ddba601a03f0545c620844eaafa9a3cb0..510641744cd1b0d1ac3b03c39fd921c8908a4c8f 100644 (file)
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -32,7 +32,7 @@ public:
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }
 
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }
 

-protected:
+//EK protected:

     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;
 };
     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;
 };

diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h
index ab87cf1f5b2c1fd63afafed24cdc3dd83106b02c..8970ab8a47dd0ecc5235005e54ac171dc48ce81b 100644 (file)
--- a/include/wx/os2/helpwin.h
+++ b/include/wx/os2/helpwin.h
@@ -12,7 +12,9 @@
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 
 #ifndef _WX_HELPWIN_H_
 #define _WX_HELPWIN_H_
 

-#include "wx/wx.h"
+//EK #include "wx/wx.h"
+
+#if wxUSE_HELP

 
 #include "wx/helpbase.h"
 
 
 #include "wx/helpbase.h"
 


@@ -47,5 +49,7 @@ private:
     bool DisplaySection(const wxString& rSection) { return wxHelpControllerBase::DisplaySection(rSection); }
 };
 
     bool DisplaySection(const wxString& rSection) { return wxHelpControllerBase::DisplaySection(rSection); }
 };
 

+#endif //wxUSE_HELP
+

 #endif
     // _WX_HELPWIN_H_
 #endif
     // _WX_HELPWIN_H_

diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index c3af84e11c2eb6c267b1d50ffdce84a685700a64..ee6d18b1bcff0a5274e2ed749b17cf229143a6db 100644 (file)
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -15,6 +15,12 @@
 // ----------------------------------------------------------------------------
 // global settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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
 
 // define this to 1 if you want icons to behave as bitmaps
 #define wxICON_IS_BITMAP     0